[vlmc-devel] Include explicitely Gui/*
Jean-Baptiste Kempf
git at videolan.org
Sat Mar 1 19:14:50 CET 2014
vlmc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar 1 19:10:06 2014 +0100| [76d0cbf47b3d7354d8e8e01f272954f60ef043f8] | committer: Jean-Baptiste Kempf
Include explicitely Gui/*
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=76d0cbf47b3d7354d8e8e01f272954f60ef043f8
---
src/CMakeLists.txt | 5 -----
src/Gui/ClipProperty.cpp | 3 ++-
src/Gui/effectsengine/ui/EffectInstanceWidget.ui | 2 +-
src/Gui/import/ImportController.cpp | 9 +++++----
src/Gui/import/ImportController.h | 2 +-
src/Gui/import/ui/ImportController.ui | 4 ++--
src/Gui/preview/ui/PreviewWidget.ui | 6 +++---
src/Gui/project/GuiProjectManager.cpp | 3 ++-
src/Gui/timeline/GraphicsEffectItem.cpp | 8 +++++---
src/Gui/ui/ClipProperty.ui | 2 +-
src/Gui/widgets/TrackControls.cpp | 6 ++++--
11 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1a555a1..86e3c4f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -87,11 +87,6 @@ INCLUDE_DIRECTORIES(
.
Backend/VLC/LibVLCpp
Gui
- Gui/effectsengine
- Gui/library
- Gui/media
- Gui/preview
- Gui/timeline
)
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
diff --git a/src/Gui/ClipProperty.cpp b/src/Gui/ClipProperty.cpp
index d8bfc7a..df8a6d8 100644
--- a/src/Gui/ClipProperty.cpp
+++ b/src/Gui/ClipProperty.cpp
@@ -25,7 +25,8 @@
#include "Media/Clip.h"
#include "Media/Media.h"
-#include "ClipMetadataDisplayer.h"
+
+#include "Gui/media/ClipMetadataDisplayer.h"
#include <QInputDialog>
#include <QPushButton>
diff --git a/src/Gui/effectsengine/ui/EffectInstanceWidget.ui b/src/Gui/effectsengine/ui/EffectInstanceWidget.ui
index 5fcdf3c..6115272 100644
--- a/src/Gui/effectsengine/ui/EffectInstanceWidget.ui
+++ b/src/Gui/effectsengine/ui/EffectInstanceWidget.ui
@@ -85,7 +85,7 @@
<customwidget>
<class>EffectWidget</class>
<extends>QWidget</extends>
- <header>EffectWidget.h</header>
+ <header>effectsengine/EffectWidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/src/Gui/import/ImportController.cpp b/src/Gui/import/ImportController.cpp
index 5667b82..2167923 100644
--- a/src/Gui/import/ImportController.cpp
+++ b/src/Gui/import/ImportController.cpp
@@ -26,20 +26,21 @@
#include "ui_ImportController.h"
#include "Media/Clip.h"
-#include "ClipMetadataDisplayer.h"
#include "Renderer/ClipRenderer.h"
#include "Backend/ISource.h"
#include "Library/Library.h"
#include "Media/Media.h"
-#include "MediaCellView.h"
-#include "MediaListView.h"
#include "Metadata/MetaDataManager.h"
-#include "PreviewWidget.h"
#include "Settings/SettingsManager.h"
#include "TagWidget.h"
#include "Media/Transcoder.h"
#include "Tools/VlmcDebug.h"
+#include "media/ClipMetadataDisplayer.h"
+#include "library/MediaCellView.h"
+#include "library/MediaListView.h"
+#include "preview/PreviewWidget.h"
+
#include <QFileSystemModel>
#include <QHeaderView>
#include <QMessageBox>
diff --git a/src/Gui/import/ImportController.h b/src/Gui/import/ImportController.h
index 12c5c4a..ad3ddb3 100644
--- a/src/Gui/import/ImportController.h
+++ b/src/Gui/import/ImportController.h
@@ -30,7 +30,7 @@
#ifndef IMPORTCONTROLLER_H
#define IMPORTCONTROLLER_H
-#include "StackViewController.h"
+#include "Gui/library/StackViewController.h"
#include <QDialog>
#include <QUuid>
diff --git a/src/Gui/import/ui/ImportController.ui b/src/Gui/import/ui/ImportController.ui
index 66ef9b7..f551f7b 100644
--- a/src/Gui/import/ui/ImportController.ui
+++ b/src/Gui/import/ui/ImportController.ui
@@ -178,13 +178,13 @@
<customwidget>
<class>ClipMetadataDisplayer</class>
<extends>QWidget</extends>
- <header>ClipMetadataDisplayer.h</header>
+ <header>Gui/media/ClipMetadataDisplayer.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>PreviewWidget</class>
<extends>QWidget</extends>
- <header>PreviewWidget.h</header>
+ <header>Gui/preview/PreviewWidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/src/Gui/preview/ui/PreviewWidget.ui b/src/Gui/preview/ui/PreviewWidget.ui
index 874f159..8449ae5 100644
--- a/src/Gui/preview/ui/PreviewWidget.ui
+++ b/src/Gui/preview/ui/PreviewWidget.ui
@@ -509,18 +509,18 @@
<customwidget>
<class>PreviewRuler</class>
<extends>QWidget</extends>
- <header>PreviewRuler.h</header>
+ <header>Gui/preview/PreviewRuler.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>LCDTimecode</class>
<extends>QLCDNumber</extends>
- <header>LCDTimecode.h</header>
+ <header>Gui/preview/LCDTimecode.h</header>
</customwidget>
<customwidget>
<class>RenderWidget</class>
<extends>QWidget</extends>
- <header>RenderWidget.h</header>
+ <header>Gui/preview/RenderWidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/src/Gui/project/GuiProjectManager.cpp b/src/Gui/project/GuiProjectManager.cpp
index 0bfd7cc..ff16851 100644
--- a/src/Gui/project/GuiProjectManager.cpp
+++ b/src/Gui/project/GuiProjectManager.cpp
@@ -25,9 +25,10 @@
#include "Library/Library.h"
#include "Workflow/MainWorkflow.h"
#include "Settings/SettingsManager.h"
-#include "Timeline.h"
#include "Project/Workspace.h"
+#include "timeline/Timeline.h"
+
#include <QDateTime>
#include <QFileDialog>
#include <QMessageBox>
diff --git a/src/Gui/timeline/GraphicsEffectItem.cpp b/src/Gui/timeline/GraphicsEffectItem.cpp
index 3ea9917..4013d8c 100644
--- a/src/Gui/timeline/GraphicsEffectItem.cpp
+++ b/src/Gui/timeline/GraphicsEffectItem.cpp
@@ -22,16 +22,18 @@
#include "GraphicsEffectItem.h"
-#include "AbstractGraphicsMediaItem.h"
#include "Commands/Commands.h"
#include "EffectsEngine/EffectHelper.h"
#include "EffectsEngine/EffectInstance.h"
-#include "EffectInstanceWidget.h"
+#include "Workflow/TrackWorkflow.h"
+
+#include "effectsengine/EffectInstanceWidget.h"
+
+#include "AbstractGraphicsMediaItem.h"
#include "GraphicsTrack.h"
#include "Timeline.h"
#include "TracksScene.h"
#include "TracksView.h"
-#include "Workflow/TrackWorkflow.h"
#include <QColorDialog>
#include <QGraphicsSceneContextMenuEvent>
diff --git a/src/Gui/ui/ClipProperty.ui b/src/Gui/ui/ClipProperty.ui
index 7534535..e602351 100644
--- a/src/Gui/ui/ClipProperty.ui
+++ b/src/Gui/ui/ClipProperty.ui
@@ -164,7 +164,7 @@
<customwidget>
<class>ClipMetadataDisplayer</class>
<extends>QWidget</extends>
- <header>ClipMetadataDisplayer.h</header>
+ <header>Gui/media/ClipMetadataDisplayer.h</header>
<container>1</container>
</customwidget>
</customwidgets>
diff --git a/src/Gui/widgets/TrackControls.cpp b/src/Gui/widgets/TrackControls.cpp
index e6f84d1..f971609 100644
--- a/src/Gui/widgets/TrackControls.cpp
+++ b/src/Gui/widgets/TrackControls.cpp
@@ -20,9 +20,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "GraphicsTrack.h"
-#include "EffectStack.h"
#include "TrackControls.h"
+
+#include "timeline/GraphicsTrack.h"
+#include "effectsengine/EffectStack.h"
+
#include "Workflow/TrackWorkflow.h"
#include "ui_TrackControls.h"
More information about the Vlmc-devel
mailing list