Project: prepend the include folders

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>

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;

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
 

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>

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>

src/Project/WorkspaceWorker.h

@@ -25,7 +25,7 @@
 
 #include <QThread>
 
-class   Media;
+class Media;
 
 class WorkspaceWorker : public QThread
 {