[vlmc-devel] Include explicitely Gui/widgets/

[Jean-Baptiste Kempf]

vlmc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar  1 18:57:10 2014 +0100| [be1129c101bf90c2d42c9570cc6c9b9c2a662682] | committer: Jean-Baptiste Kempf

Include explicitely Gui/widgets/

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=be1129c101bf90c2d42c9570cc6c9b9c2a662682
---

 src/CMakeLists.txt                        |    1 -
 src/Gui/effectsengine/ui/EffectWidget.ui  |    2 +-
 src/Gui/library/ui/MediaCellView.ui       |    2 +-
 src/Gui/library/ui/MediaLibrary.ui        |    2 +-
 src/Gui/media/ui/ClipMetadataDisplayer.ui |    2 +-
 src/Gui/timeline/TracksControls.h         |    2 +-
 src/Gui/widgets/ui/TrackControls.ui       |    2 +-
 src/Main/vlmc.cpp                         |    2 +-
 8 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e90346c..1a555a1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -92,7 +92,6 @@ INCLUDE_DIRECTORIES(
   Gui/media
   Gui/preview
   Gui/timeline
-  Gui/widgets
 )
 
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
diff --git a/src/Gui/effectsengine/ui/EffectWidget.ui b/src/Gui/effectsengine/ui/EffectWidget.ui
index 50a0b7d..add97ff 100644
--- a/src/Gui/effectsengine/ui/EffectWidget.ui
+++ b/src/Gui/effectsengine/ui/EffectWidget.ui
@@ -163,7 +163,7 @@
   <customwidget>
    <class>ExtendedLabel</class>
    <extends>QLabel</extends>
-   <header>ExtendedLabel.h</header>
+   <header>Gui/widgets/ExtendedLabel.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/Gui/library/ui/MediaCellView.ui b/src/Gui/library/ui/MediaCellView.ui
index 0749694..089f5e7 100644
--- a/src/Gui/library/ui/MediaCellView.ui
+++ b/src/Gui/library/ui/MediaCellView.ui
@@ -243,7 +243,7 @@
   <customwidget>
    <class>ExtendedLabel</class>
    <extends>QLabel</extends>
-   <header>ExtendedLabel.h</header>
+   <header>Gui/widgets/ExtendedLabel.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/Gui/library/ui/MediaLibrary.ui b/src/Gui/library/ui/MediaLibrary.ui
index 906a185..14c2710 100644
--- a/src/Gui/library/ui/MediaLibrary.ui
+++ b/src/Gui/library/ui/MediaLibrary.ui
@@ -66,7 +66,7 @@
   <customwidget>
    <class>SearchLineEdit</class>
    <extends>QLineEdit</extends>
-   <header>SearchLineEdit.h</header>
+   <header>Gui/widgets/SearchLineEdit.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/Gui/media/ui/ClipMetadataDisplayer.ui b/src/Gui/media/ui/ClipMetadataDisplayer.ui
index 5780eac..97c54db 100644
--- a/src/Gui/media/ui/ClipMetadataDisplayer.ui
+++ b/src/Gui/media/ui/ClipMetadataDisplayer.ui
@@ -292,7 +292,7 @@
   <customwidget>
    <class>ExtendedLabel</class>
    <extends>QLabel</extends>
-   <header>ExtendedLabel.h</header>
+   <header>Gui/widgets/ExtendedLabel.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/Gui/timeline/TracksControls.h b/src/Gui/timeline/TracksControls.h
index 3c466ee..b33a102 100644
--- a/src/Gui/timeline/TracksControls.h
+++ b/src/Gui/timeline/TracksControls.h
@@ -25,7 +25,7 @@
 
 #include <QScrollArea>
 #include <QVBoxLayout>
-#include "TrackControls.h"
+#include "Gui/widgets/TrackControls.h"
 
 class GraphicsTrack;
 
diff --git a/src/Gui/widgets/ui/TrackControls.ui b/src/Gui/widgets/ui/TrackControls.ui
index 6624dab..6bc956c 100644
--- a/src/Gui/widgets/ui/TrackControls.ui
+++ b/src/Gui/widgets/ui/TrackControls.ui
@@ -103,7 +103,7 @@
   <customwidget>
    <class>ExtendedLabel</class>
    <extends>QLabel</extends>
-   <header>ExtendedLabel.h</header>
+   <header>Gui/widgets/ExtendedLabel.h</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/Main/vlmc.cpp b/src/Main/vlmc.cpp
index b5bf4c5..bd42f1e 100644
--- a/src/Main/vlmc.cpp
+++ b/src/Main/vlmc.cpp
@@ -40,7 +40,7 @@ int VLMCmain( int , char** );
 #ifdef WITH_GUI
     #include "Gui/project/GuiProjectManager.h"
     #ifdef WITH_CRASHHANDLER_GUI
-        #include "CrashHandler.h"
+        #include "Gui/widgets/CrashHandler.h"
     #endif
 #else
     #include "ProjectManager.h"