[vlmc-devel] Project: prepend the include folders

[Jean-Baptiste Kempf]

vlmc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar  1 14:49:41 2014 +0100| [8a6a032bb510c39bf91b0b0df2cca9afb4ae094c] | committer: Jean-Baptiste Kempf

Project: prepend the include folders

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

 src/Project/ProjectManager.cpp  |   17 ++++++++---------
 src/Project/ProjectManager.h    |    3 ++-
 src/Project/Workspace.cpp       |   13 +++++++------
 src/Project/Workspace.h         |    5 ++---
 src/Project/WorkspaceWorker.cpp |    8 ++++----
 src/Project/WorkspaceWorker.h   |    2 +-
 6 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/Project/ProjectManager.cpp b/src/Project/ProjectManager.cpp
index f1928b5..7ac2d3b 100644
--- a/src/Project/ProjectManager.cpp
+++ b/src/Project/ProjectManager.cpp
@@ -22,15 +22,14 @@
 
 #include "config.h"
 
-#include "Library.h"
-#include "MainWorkflow.h"
-#include "project/GuiProjectManager.h"
-#include "ProjectManager.h"
-#include "SettingsManager.h"
-#include "Timeline.h"
-#include "VlmcDebug.h"
-#include "WorkflowRenderer.h"
-#include "Workspace.h"
+#include "Library/Library.h"
+#include "Workflow/MainWorkflow.h"
+#include "Gui/project/GuiProjectManager.h"
+#include "Settings/SettingsManager.h"
+#include "Gui/timeline/Timeline.h"
+#include "Tools/VlmcDebug.h"
+#include "Renderer/WorkflowRenderer.h"
+#include "Project/Workspace.h"
 
 #include <QDir>
 #include <QDomDocument>
diff --git a/src/Project/ProjectManager.h b/src/Project/ProjectManager.h
index 5c2dcca..0b75000 100644
--- a/src/Project/ProjectManager.h
+++ b/src/Project/ProjectManager.h
@@ -24,11 +24,12 @@
 #define PROJECTMANAGER_H
 
 #include "config.h"
+
 #include <QObject>
 #include <QStringList>
 #include <QDomElement>
 
-#include "Singleton.hpp"
+#include "Tools/Singleton.hpp"
 
 class   QFile;
 class   QDomDocument;
diff --git a/src/Project/Workspace.cpp b/src/Project/Workspace.cpp
index d8533ac..7369281 100644
--- a/src/Project/Workspace.cpp
+++ b/src/Project/Workspace.cpp
@@ -22,17 +22,18 @@
 
 #include "Workspace.h"
 
-#include "Clip.h"
-#include "Library.h"
-#include "Media.h"
+#include "Media/Clip.h"
+#include "Library/Library.h"
+#include "Media/Media.h"
+#include "Settings/SettingsManager.h"
+#include "Tools/VlmcDebug.h"
+
 #include "Project/WorkspaceWorker.h"
-#include "SettingsManager.h"
-#include "VlmcDebug.h"
 
 #include <QMutex>
 
 #ifdef WITH_GUI
-# include "NotificationZone.h"
+# include "Gui/widgets/NotificationZone.h"
 # include <QMessageBox>
 #endif
 
diff --git a/src/Project/Workspace.h b/src/Project/Workspace.h
index c1fe2c6..c3bc10b 100644
--- a/src/Project/Workspace.h
+++ b/src/Project/Workspace.h
@@ -23,9 +23,8 @@
 #ifndef WORKSPACE_H
 #define WORKSPACE_H
 
-#include "Singleton.hpp"
-
-#include "ErrorHandler.h"
+#include "Tools/Singleton.hpp"
+#include "Tools/ErrorHandler.h"
 
 #include <QObject>
 #include <QQueue>
diff --git a/src/Project/WorkspaceWorker.cpp b/src/Project/WorkspaceWorker.cpp
index d1d6b10..edcdc26 100644
--- a/src/Project/WorkspaceWorker.cpp
+++ b/src/Project/WorkspaceWorker.cpp
@@ -20,11 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "WorkspaceWorker.h"
+#include "Project/WorkspaceWorker.h"
 
-#include "Media.h"
-#include "SettingsManager.h"
-#include "VlmcDebug.h"
+#include "Media/Media.h"
+#include "Settings/SettingsManager.h"
+#include "Tools/VlmcDebug.h"
 
 #include <cerrno>
 #include <unistd.h>
diff --git a/src/Project/WorkspaceWorker.h b/src/Project/WorkspaceWorker.h
index 15f0b1b..d25554b 100644
--- a/src/Project/WorkspaceWorker.h
+++ b/src/Project/WorkspaceWorker.h
@@ -25,7 +25,7 @@
 
 #include <QThread>
 
-class   Media;
+class Media;
 
 class WorkspaceWorker : public QThread
 {