[vlmc-devel] Commands: cleanup the includes

[Jean-Baptiste Kempf]

vlmc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar  1 14:55:31 2014 +0100| [51b34a724d4701f82ca25cb4a4fb962df3d0bcd5] | committer: Jean-Baptiste Kempf

Commands: cleanup the includes

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

 src/Commands/Commands.cpp               |   17 +++++++++--------
 src/Commands/Commands.h                 |    6 ++++--
 src/Commands/KeyboardShortcutHelper.cpp |    5 +++--
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/Commands/Commands.cpp b/src/Commands/Commands.cpp
index 4df1a9e..3e22338 100644
--- a/src/Commands/Commands.cpp
+++ b/src/Commands/Commands.cpp
@@ -21,18 +21,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include "config.h"
+
 #include "Commands.h"
 
-#include "config.h"
-#include "Clip.h"
-#include "ClipHelper.h"
-#include "EffectHelper.h"
-#include "EffectInstance.h"
-#include "MainWorkflow.h"
-#include "TrackWorkflow.h"
+#include "Media/Clip.h"
+#include "Workflow/ClipHelper.h"
+#include "EffectsEngine/EffectHelper.h"
+#include "EffectsEngine/EffectInstance.h"
+#include "Workflow/MainWorkflow.h"
+#include "Workflow/TrackWorkflow.h"
 
 #ifdef WITH_GUI
-# include "UndoStack.h"
+# include "Gui/UndoStack.h"
 
 void
 Commands::trigger( QUndoCommand* command )
diff --git a/src/Commands/Commands.h b/src/Commands/Commands.h
index 48932fe..bd5c0b4 100644
--- a/src/Commands/Commands.h
+++ b/src/Commands/Commands.h
@@ -25,13 +25,15 @@
 #define COMMANDS_H
 
 #include "config.h"
+
 #ifdef WITH_GUI
 # include <QUndoCommand>
 #endif
 #include <QObject>
 #include <QVector>
-#include "MainWorkflow.h"
-#include "Types.h"
+
+#include "Workflow/MainWorkflow.h"
+#include "Workflow/Types.h"
 
 class   Clip;
 class   ClipHelper;
diff --git a/src/Commands/KeyboardShortcutHelper.cpp b/src/Commands/KeyboardShortcutHelper.cpp
index b8323d4..9548d4c 100644
--- a/src/Commands/KeyboardShortcutHelper.cpp
+++ b/src/Commands/KeyboardShortcutHelper.cpp
@@ -22,10 +22,11 @@
 
 #include <QAction>
 
-#include "SettingValue.h"
-#include "SettingsManager.h"
 #include "KeyboardShortcutHelper.h"
 
+#include "Settings/SettingValue.h"
+#include "Settings/SettingsManager.h"
+
 KeyboardShortcutHelper::KeyboardShortcutHelper( const QString& name, QWidget* parent ) :
         QShortcut( parent ),
         m_name( name ),