[vlmc-devel] Gui/Timeline: rework includes folders
Jean-Baptiste Kempf
git at videolan.org
Sat Mar 1 16:59:55 CET 2014
vlmc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar 1 16:54:27 2014 +0100| [363f8d6ac05b5c9cfbd630d529bf83606b593b35] | committer: Jean-Baptiste Kempf
Gui/Timeline: rework includes folders
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=363f8d6ac05b5c9cfbd630d529bf83606b593b35
---
src/Gui/timeline/AbstractGraphicsItem.cpp | 2 +-
src/Gui/timeline/AbstractGraphicsItem.h | 2 +-
src/Gui/timeline/AbstractGraphicsMediaItem.cpp | 10 +++++-----
src/Gui/timeline/GraphicsAudioItem.cpp | 6 +++---
src/Gui/timeline/GraphicsAudioItem.h | 2 +-
src/Gui/timeline/GraphicsCursorItem.h | 2 +-
src/Gui/timeline/GraphicsEffectItem.cpp | 8 ++++----
src/Gui/timeline/GraphicsEffectItem.h | 2 +-
src/Gui/timeline/GraphicsMovieItem.cpp | 8 ++++----
src/Gui/timeline/GraphicsTrack.cpp | 2 +-
src/Gui/timeline/GraphicsTrack.h | 2 +-
src/Gui/timeline/Timeline.cpp | 8 ++++----
src/Gui/timeline/Timeline.h | 4 ++--
src/Gui/timeline/TracksRuler.cpp | 2 +-
src/Gui/timeline/TracksScene.cpp | 10 +++++-----
src/Gui/timeline/TracksView.cpp | 24 ++++++++++++------------
src/Gui/timeline/TracksView.h | 2 +-
17 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/src/Gui/timeline/AbstractGraphicsItem.cpp b/src/Gui/timeline/AbstractGraphicsItem.cpp
index 803a124..3ec46f6 100644
--- a/src/Gui/timeline/AbstractGraphicsItem.cpp
+++ b/src/Gui/timeline/AbstractGraphicsItem.cpp
@@ -22,7 +22,7 @@
#include "AbstractGraphicsItem.h"
-#include "Helper.h"
+#include "Workflow/Helper.h"
#include "GraphicsTrack.h"
#include "TracksView.h"
#include "TracksScene.h"
diff --git a/src/Gui/timeline/AbstractGraphicsItem.h b/src/Gui/timeline/AbstractGraphicsItem.h
index db95fe8..173a9a2 100644
--- a/src/Gui/timeline/AbstractGraphicsItem.h
+++ b/src/Gui/timeline/AbstractGraphicsItem.h
@@ -37,7 +37,7 @@ namespace Workflow
class Helper;
}
-#include "Types.h"
+#include "Workflow/Types.h"
class AbstractGraphicsItem : public QObject, public QGraphicsItem
{
diff --git a/src/Gui/timeline/AbstractGraphicsMediaItem.cpp b/src/Gui/timeline/AbstractGraphicsMediaItem.cpp
index a645199..71cfa4a 100644
--- a/src/Gui/timeline/AbstractGraphicsMediaItem.cpp
+++ b/src/Gui/timeline/AbstractGraphicsMediaItem.cpp
@@ -23,13 +23,13 @@
#include "AbstractGraphicsMediaItem.h"
#include "TracksView.h"
#include "TracksScene.h"
-#include "TrackWorkflow.h"
+#include "Workflow/TrackWorkflow.h"
#include "GraphicsTrack.h"
-#include "Clip.h"
-#include "ClipHelper.h"
-#include "Commands.h"
-#include "Media.h"
+#include "Media/Clip.h"
+#include "Workflow/ClipHelper.h"
+#include "Commands/Commands.h"
+#include "Media/Media.h"
#include <QMenu>
#include <QColorDialog>
diff --git a/src/Gui/timeline/GraphicsAudioItem.cpp b/src/Gui/timeline/GraphicsAudioItem.cpp
index 57e5b14..95c9ac0 100644
--- a/src/Gui/timeline/GraphicsAudioItem.cpp
+++ b/src/Gui/timeline/GraphicsAudioItem.cpp
@@ -23,9 +23,9 @@
#include "GraphicsAudioItem.h"
-#include "ClipHelper.h"
-#include "ISource.h"
-#include "Media.h"
+#include "Workflow/ClipHelper.h"
+#include "Backend/ISource.h"
+#include "Media/Media.h"
#include "TracksView.h"
#include "Timeline.h"
diff --git a/src/Gui/timeline/GraphicsAudioItem.h b/src/Gui/timeline/GraphicsAudioItem.h
index eea1234..91abdb3 100644
--- a/src/Gui/timeline/GraphicsAudioItem.h
+++ b/src/Gui/timeline/GraphicsAudioItem.h
@@ -25,7 +25,7 @@
#include <QFontMetrics>
#include "AbstractGraphicsMediaItem.h"
-#include "Clip.h"
+#include "Media/Clip.h"
#include "TracksView.h"
/**
diff --git a/src/Gui/timeline/GraphicsCursorItem.h b/src/Gui/timeline/GraphicsCursorItem.h
index 168c243..d2294fc 100644
--- a/src/Gui/timeline/GraphicsCursorItem.h
+++ b/src/Gui/timeline/GraphicsCursorItem.h
@@ -23,7 +23,7 @@
#ifndef GRAPHICSCURSORITEM_H
#define GRAPHICSCURSORITEM_H
-#include "Types.h"
+#include "Workflow/Types.h"
#include <QObject>
#include <QGraphicsItem>
#include <QPen>
diff --git a/src/Gui/timeline/GraphicsEffectItem.cpp b/src/Gui/timeline/GraphicsEffectItem.cpp
index f7119ed..3ea9917 100644
--- a/src/Gui/timeline/GraphicsEffectItem.cpp
+++ b/src/Gui/timeline/GraphicsEffectItem.cpp
@@ -23,15 +23,15 @@
#include "GraphicsEffectItem.h"
#include "AbstractGraphicsMediaItem.h"
-#include "Commands.h"
-#include "EffectHelper.h"
-#include "EffectInstance.h"
+#include "Commands/Commands.h"
+#include "EffectsEngine/EffectHelper.h"
+#include "EffectsEngine/EffectInstance.h"
#include "EffectInstanceWidget.h"
#include "GraphicsTrack.h"
#include "Timeline.h"
#include "TracksScene.h"
#include "TracksView.h"
-#include "TrackWorkflow.h"
+#include "Workflow/TrackWorkflow.h"
#include <QColorDialog>
#include <QGraphicsSceneContextMenuEvent>
diff --git a/src/Gui/timeline/GraphicsEffectItem.h b/src/Gui/timeline/GraphicsEffectItem.h
index 3090459..2458d1d 100644
--- a/src/Gui/timeline/GraphicsEffectItem.h
+++ b/src/Gui/timeline/GraphicsEffectItem.h
@@ -24,7 +24,7 @@
#define GRAPHICSEFFECTITEM_H
#include "AbstractGraphicsItem.h"
-#include "EffectsEngine.h"
+#include "EffectsEngine/EffectsEngine.h"
class EffectUser;
class AbstractGraphicsMediaItem;
diff --git a/src/Gui/timeline/GraphicsMovieItem.cpp b/src/Gui/timeline/GraphicsMovieItem.cpp
index 9090c9e..0cab260 100644
--- a/src/Gui/timeline/GraphicsMovieItem.cpp
+++ b/src/Gui/timeline/GraphicsMovieItem.cpp
@@ -20,11 +20,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "Clip.h"
-#include "ClipHelper.h"
+#include "Media/Clip.h"
+#include "Workflow/ClipHelper.h"
#include "GraphicsMovieItem.h"
-#include "ISource.h"
-#include "Media.h"
+#include "Backend/ISource.h"
+#include "Media/Media.h"
#include "TracksView.h"
#include "Timeline.h"
diff --git a/src/Gui/timeline/GraphicsTrack.cpp b/src/Gui/timeline/GraphicsTrack.cpp
index 99dc134..4fb1f23 100644
--- a/src/Gui/timeline/GraphicsTrack.cpp
+++ b/src/Gui/timeline/GraphicsTrack.cpp
@@ -23,7 +23,7 @@
#include <QList>
#include "TracksView.h"
#include "GraphicsTrack.h"
-#include "MainWorkflow.h"
+#include "Workflow/MainWorkflow.h"
GraphicsTrack::GraphicsTrack( Workflow::TrackType type, quint32 trackNumber,
QGraphicsItem *parent ) :
diff --git a/src/Gui/timeline/GraphicsTrack.h b/src/Gui/timeline/GraphicsTrack.h
index 8c9bde0..96624a8 100644
--- a/src/Gui/timeline/GraphicsTrack.h
+++ b/src/Gui/timeline/GraphicsTrack.h
@@ -25,7 +25,7 @@
#include <QGraphicsWidget>
#include <QList>
-#include "Types.h"
+#include "Workflow/Types.h"
class AbstractGraphicsItem;
class AbstractGraphicsMediaItem;
diff --git a/src/Gui/timeline/Timeline.cpp b/src/Gui/timeline/Timeline.cpp
index 2ca2987..9101725 100644
--- a/src/Gui/timeline/Timeline.cpp
+++ b/src/Gui/timeline/Timeline.cpp
@@ -22,14 +22,14 @@
#include "Timeline.h"
-#include "Clip.h"
-#include "ClipHelper.h"
+#include "Media/Clip.h"
+#include "Workflow/ClipHelper.h"
#include "TracksView.h"
#include "TracksScene.h"
#include "TracksControls.h"
#include "TracksRuler.h"
-#include "VlmcDebug.h"
-#include "WorkflowRenderer.h"
+#include "Tools/VlmcDebug.h"
+#include "Renderer/WorkflowRenderer.h"
#include <QHBoxLayout>
#include <QDomElement>
diff --git a/src/Gui/timeline/Timeline.h b/src/Gui/timeline/Timeline.h
index 5fb0adb..9931fb0 100644
--- a/src/Gui/timeline/Timeline.h
+++ b/src/Gui/timeline/Timeline.h
@@ -23,10 +23,10 @@
#ifndef TIMELINE_H
#define TIMELINE_H
-#include "ClipHelper.h"
+#include "Workflow/ClipHelper.h"
#include "vlmc.h"
#include "ui_Timeline.h"
-#include "Types.h"
+#include "Workflow/Types.h"
#include <QDomElement>
#include <QXmlStreamWriter>
diff --git a/src/Gui/timeline/TracksRuler.cpp b/src/Gui/timeline/TracksRuler.cpp
index 4382b7f..efbee84 100644
--- a/src/Gui/timeline/TracksRuler.cpp
+++ b/src/Gui/timeline/TracksRuler.cpp
@@ -27,7 +27,7 @@
#include <QPolygon>
#include "TracksRuler.h"
#include "TracksView.h"
-#include "SettingsManager.h"
+#include "Settings/SettingsManager.h"
const int TracksRuler::comboScale[] = { 1, 2, 5, 10, 25, 50, 125, 250, 500, 725, 1500, 3000, 6000, 12000};
diff --git a/src/Gui/timeline/TracksScene.cpp b/src/Gui/timeline/TracksScene.cpp
index c5ed169..b829531 100644
--- a/src/Gui/timeline/TracksScene.cpp
+++ b/src/Gui/timeline/TracksScene.cpp
@@ -22,15 +22,15 @@
#include "TracksScene.h"
-#include "Commands.h"
-#include "ClipHelper.h"
-#include "EffectHelper.h"
+#include "Commands/Commands.h"
+#include "Workflow/ClipHelper.h"
+#include "EffectsEngine/EffectHelper.h"
#include "GraphicsAudioItem.h"
#include "GraphicsMovieItem.h"
#include "GraphicsTrack.h"
-#include "SettingsManager.h"
+#include "Settings/SettingsManager.h"
#include "Timeline.h"
-#include "TrackWorkflow.h"
+#include "Workflow/TrackWorkflow.h"
#include "UndoStack.h"
#include <QMessageBox>
diff --git a/src/Gui/timeline/TracksView.cpp b/src/Gui/timeline/TracksView.cpp
index 9efb3c5..bde807e 100644
--- a/src/Gui/timeline/TracksView.cpp
+++ b/src/Gui/timeline/TracksView.cpp
@@ -22,27 +22,27 @@
#include "TracksView.h"
-#include "ClipHelper.h"
-#include "ClipWorkflow.h"
-#include "Commands.h"
-#include "EffectHelper.h"
+#include "Workflow/ClipHelper.h"
+#include "Workflow/ClipWorkflow.h"
+#include "Commands/Commands.h"
+#include "EffectsEngine/EffectHelper.h"
#include "GraphicsMovieItem.h"
#include "GraphicsAudioItem.h"
#include "GraphicsEffectItem.h"
#include "GraphicsCursorItem.h"
#include "GraphicsTrack.h"
-#include "Helper.h"
-#include "ISource.h"
-#include "Library.h"
-#include "Media.h"
+#include "Workflow/Helper.h"
+#include "Backend/ISource.h"
+#include "Library/Library.h"
+#include "Media/Media.h"
//Ugly part {
#include "Timeline.h"
#include "TracksRuler.h"
//} this should be fixed, it breaks the design
-#include "TrackWorkflow.h"
-#include "UndoStack.h"
-#include "VlmcDebug.h"
-#include "WorkflowRenderer.h"
+#include "Workflow/TrackWorkflow.h"
+#include "Gui/UndoStack.h"
+#include "Tools/VlmcDebug.h"
+#include "Renderer/WorkflowRenderer.h"
#include <QGraphicsLinearLayout>
#include <QGraphicsWidget>
diff --git a/src/Gui/timeline/TracksView.h b/src/Gui/timeline/TracksView.h
index 3848f6d..93ae10a 100644
--- a/src/Gui/timeline/TracksView.h
+++ b/src/Gui/timeline/TracksView.h
@@ -26,7 +26,7 @@
#include "vlmc.h"
#include "AbstractGraphicsMediaItem.h"
#include "GraphicsCursorItem.h"
-#include "Types.h"
+#include "Workflow/Types.h"
#include <QWidget>
#include <QGraphicsView>
More information about the Vlmc-devel
mailing list