EffectsEngine: rework includes path

src/EffectsEngine/Effect.cpp

@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "Effect.h"
-#include "EffectInstance.h"
+#include "EffectsEngine/Effect.h"
+#include "EffectsEngine/EffectInstance.h"
 
 #include "VlmcDebug.h"
 

src/EffectsEngine/Effect.h

@@ -25,7 +25,7 @@
 
 #include <QLibrary>
 
-#include "frei0r.h"
+#include <frei0r.h>
 
 class   EffectInstance;
 

src/EffectsEngine/EffectHelper.cpp

@@ -20,9 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "EffectHelper.h"
-#include "EffectUser.h"
-#include "MainWorkflow.h"
+#include "EffectsEngine/EffectHelper.h"
+#include "EffectsEngine/EffectUser.h"
+#include "Workflow/MainWorkflow.h"
 
 EffectHelper::EffectHelper( EffectInstance *effectInstance, qint64 begin, qint64 end,
                             const QString &uuid ) :

src/EffectsEngine/EffectHelper.h

@@ -26,12 +26,13 @@
 class   EffectInstance;
 class   EffectUser;
 
-#include "Helper.h"
-
 #include <QObject>
 #include <QUuid>
 #include <QMetaType>
 
+#include "Workflow/Helper.h"
+
+
 class   EffectHelper : public Workflow::Helper
 {
     Q_OBJECT

src/EffectsEngine/EffectInstance.cpp

@@ -20,10 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "EffectInstance.h"
-#include "EffectSettingValue.h"
+#include "EffectsEngine/EffectInstance.h"
+#include "EffectsEngine/EffectSettingValue.h"
 
-#include "Effect.h"
+#include "EffectsEngine/Effect.h"
 
 EffectInstance::EffectInstance( Effect *effect ) :
         m_effect( effect ),

src/EffectsEngine/EffectInstance.h

@@ -25,10 +25,12 @@
 
 class   EffectSettingValue;
 
-#include "Effect.h"
-
 #include <QHash>
-#include "frei0r.h"
+
+#include <frei0r.h>
+
+#include "EffectsEngine/Effect.h"
+
 
 class EffectInstance
 {

src/EffectsEngine/EffectSettingValue.cpp

@@ -20,14 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "Effect.h"
-#include "EffectSettingValue.h"
-#include "EffectInstance.h"
-#include "VlmcDebug.h"
-
 #include <QColor>
 #include <QPoint>
 
+#include "EffectsEngine/Effect.h"
+#include "EffectsEngine/EffectSettingValue.h"
+#include "EffectsEngine/EffectInstance.h"
+#include "Tools/VlmcDebug.h"
+
 EffectSettingValue::EffectSettingValue( const QString& key, Type type, EffectInstance* instance, quint32 index,
                                         const char *name, const char *desc, Flags flags ) :
     SettingValue( key, type, QVariant(), name, desc, flags ),

src/EffectsEngine/EffectSettingValue.h

@@ -23,8 +23,9 @@
 #ifndef EFFECTSETTINGVALUE_H
 #define EFFECTSETTINGVALUE_H
 
-#include "SettingValue.h"
-#include "frei0r.h"
+#include <frei0r.h>
+
+#include "Settings/SettingValue.h"
 
 class   EffectInstance;
 

src/EffectsEngine/EffectUser.cpp

@@ -20,16 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "EffectUser.h"
-
-#include "EffectHelper.h"
-#include "EffectInstance.h"
-#include "Types.h"
-#include "VlmcDebug.h"
-
 #include <QDomElement>
 #include <QReadWriteLock>
 
+#include "EffectsEngine/EffectUser.h"
+#include "EffectsEngine/EffectHelper.h"
+#include "EffectsEngine/EffectInstance.h"
+
+#include "Workflow/Types.h"
+#include "Tools/VlmcDebug.h"
+
 EffectUser::EffectUser() :
         m_isRendering( false ),
         m_width( 0 ),

src/EffectsEngine/EffectUser.h

@@ -23,12 +23,11 @@
 #ifndef EFFECTUSER_H
 #define EFFECTUSER_H
 
-#include "EffectsEngine.h"
-
 #include <QObject>
-#include <QList>
 #include <QXmlStreamWriter>
 
+#include "EffectsEngine/EffectsEngine.h"
+
 class   QDomElement;
 class   QReadWriteLock;
 

src/EffectsEngine/EffectsEngine.cpp

@@ -20,15 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "EffectsEngine.h"
-
-#include "Effect.h"
-#include "EffectInstance.h"
-#include "Types.h"
-
-#include "VlmcDebug.h"
-
 #include <QApplication>
+#include <QDir>
+#include <QProcess>
+#include <QSettings>
+#include <QXmlStreamWriter>
 
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
 # include <QStandardPaths>
@@ -36,15 +32,17 @@
 # include <QDesktopServices>
 #endif
 
-#include <QDir>
-#include <QProcess>
-#include <QSettings>
-#include <QXmlStreamWriter>
-
 #ifdef Q_OS_WIN
-#include <windows.h>
+# include <windows.h>
 #endif
 
+
+#include "EffectsEngine/EffectsEngine.h"
+#include "EffectsEngine/Effect.h"
+#include "EffectsEngine/EffectInstance.h"
+#include "Workflow/Types.h"
+#include "Tools/VlmcDebug.h"
+
 EffectsEngine::EffectsEngine()
 {
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)

src/EffectsEngine/EffectsEngine.h

@@ -23,8 +23,6 @@
 #ifndef EFFECTSENGINE_H
 #define EFFECTSENGINE_H
 
-#include "Singleton.hpp"
-#include "Effect.h"
 
 namespace Workflow
 {
@@ -44,6 +42,9 @@ class   QXmlStreamWriter;
 #include <QUuid>
 #include <QMetaType>
 
+#include "Tools/Singleton.hpp"
+#include "EffectsEngine/Effect.h"
+
 class   QSettings;
 
 class   EffectsEngine : public QObject, public Singleton<EffectsEngine>