[vlmc-devel] EffectsEngine: rework includes path
Jean-Baptiste Kempf
git at videolan.org
Sat Mar 1 15:37:36 CET 2014
vlmc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar 1 15:37:08 2014 +0100| [7b5a28332faf98194dba5de8677debea67a45a53] | committer: Jean-Baptiste Kempf
EffectsEngine: rework includes path
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=7b5a28332faf98194dba5de8677debea67a45a53
---
src/EffectsEngine/Effect.cpp | 4 ++--
src/EffectsEngine/Effect.h | 2 +-
src/EffectsEngine/EffectHelper.cpp | 6 +++---
src/EffectsEngine/EffectHelper.h | 5 +++--
src/EffectsEngine/EffectInstance.cpp | 6 +++---
src/EffectsEngine/EffectInstance.h | 8 +++++---
src/EffectsEngine/EffectSettingValue.cpp | 10 +++++-----
src/EffectsEngine/EffectSettingValue.h | 5 +++--
src/EffectsEngine/EffectUser.cpp | 14 +++++++-------
src/EffectsEngine/EffectUser.h | 5 ++---
src/EffectsEngine/EffectsEngine.cpp | 26 ++++++++++++--------------
src/EffectsEngine/EffectsEngine.h | 5 +++--
12 files changed, 49 insertions(+), 47 deletions(-)
diff --git a/src/EffectsEngine/Effect.cpp b/src/EffectsEngine/Effect.cpp
index 7c3a971..bbdc45f 100644
--- a/src/EffectsEngine/Effect.cpp
+++ b/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"
diff --git a/src/EffectsEngine/Effect.h b/src/EffectsEngine/Effect.h
index b1df21a..25f5415 100644
--- a/src/EffectsEngine/Effect.h
+++ b/src/EffectsEngine/Effect.h
@@ -25,7 +25,7 @@
#include <QLibrary>
-#include "frei0r.h"
+#include <frei0r.h>
class EffectInstance;
diff --git a/src/EffectsEngine/EffectHelper.cpp b/src/EffectsEngine/EffectHelper.cpp
index 1773e30..802bd24 100644
--- a/src/EffectsEngine/EffectHelper.cpp
+++ b/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 ) :
diff --git a/src/EffectsEngine/EffectHelper.h b/src/EffectsEngine/EffectHelper.h
index b21a127..58e0bbe 100644
--- a/src/EffectsEngine/EffectHelper.h
+++ b/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
diff --git a/src/EffectsEngine/EffectInstance.cpp b/src/EffectsEngine/EffectInstance.cpp
index 772104e..d8e50ff 100644
--- a/src/EffectsEngine/EffectInstance.cpp
+++ b/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 ),
diff --git a/src/EffectsEngine/EffectInstance.h b/src/EffectsEngine/EffectInstance.h
index ad55a64..dd2379d 100644
--- a/src/EffectsEngine/EffectInstance.h
+++ b/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
{
diff --git a/src/EffectsEngine/EffectSettingValue.cpp b/src/EffectsEngine/EffectSettingValue.cpp
index 92c0766..d0ae092 100644
--- a/src/EffectsEngine/EffectSettingValue.cpp
+++ b/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 ),
diff --git a/src/EffectsEngine/EffectSettingValue.h b/src/EffectsEngine/EffectSettingValue.h
index 2c4866a..f7cb921 100644
--- a/src/EffectsEngine/EffectSettingValue.h
+++ b/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;
diff --git a/src/EffectsEngine/EffectUser.cpp b/src/EffectsEngine/EffectUser.cpp
index 85d1633..9351676 100644
--- a/src/EffectsEngine/EffectUser.cpp
+++ b/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 ),
diff --git a/src/EffectsEngine/EffectUser.h b/src/EffectsEngine/EffectUser.h
index 92385cf..f4e6b8b 100644
--- a/src/EffectsEngine/EffectUser.h
+++ b/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;
diff --git a/src/EffectsEngine/EffectsEngine.cpp b/src/EffectsEngine/EffectsEngine.cpp
index 276da8c..d55c22d 100644
--- a/src/EffectsEngine/EffectsEngine.cpp
+++ b/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)
diff --git a/src/EffectsEngine/EffectsEngine.h b/src/EffectsEngine/EffectsEngine.h
index 8fde2c5..b20738f 100644
--- a/src/EffectsEngine/EffectsEngine.h
+++ b/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>
More information about the Vlmc-devel
mailing list