[vlmc-devel] Clean includes related to WorkflowRenderer

Jean-Baptiste Kempf git at videolan.org
Sat Mar 1 17:43:32 CET 2014


vlmc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Mar  1 17:14:43 2014 +0100| [52abb378f3d31b11d45ba64083fb771793ab7183] | committer: Jean-Baptiste Kempf

Clean includes related to WorkflowRenderer

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

 src/Gui/MainWindow.cpp              |    1 +
 src/Main/vlmc.cpp                   |    2 +-
 src/Renderer/WorkflowFileRenderer.h |    3 ---
 src/Renderer/WorkflowRenderer.cpp   |   16 ++++++++--------
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index 44f41c4..bc31c06 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -46,6 +46,7 @@
 #include "Renderer/WorkflowFileRenderer.h"
 #include "Renderer/WorkflowRenderer.h"
 #include "Renderer/ClipRenderer.h"
+#include "WorkflowFileRendererDialog.h"
 
 /* Widgets */
 #include "DockWidgetManager.h"
diff --git a/src/Main/vlmc.cpp b/src/Main/vlmc.cpp
index f4dd283..b5bf4c5 100644
--- a/src/Main/vlmc.cpp
+++ b/src/Main/vlmc.cpp
@@ -38,7 +38,7 @@ int VLMCmain( int , char** );
 #if defined(WITH_CRASHHANDLER) && defined(Q_OS_UNIX)
 
 #ifdef WITH_GUI
-    #include "project/GuiProjectManager.h"
+    #include "Gui/project/GuiProjectManager.h"
     #ifdef WITH_CRASHHANDLER_GUI
         #include "CrashHandler.h"
     #endif
diff --git a/src/Renderer/WorkflowFileRenderer.h b/src/Renderer/WorkflowFileRenderer.h
index 9ca14a2..105e57c 100644
--- a/src/Renderer/WorkflowFileRenderer.h
+++ b/src/Renderer/WorkflowFileRenderer.h
@@ -27,9 +27,6 @@
 #include "Backend/ISourceRenderer.h"
 #include "Workflow/MainWorkflow.h"
 #include "WorkflowRenderer.h"
-#ifdef WITH_GUI
-#include "WorkflowFileRendererDialog.h"
-#endif
 
 #include <QTime>
 
diff --git a/src/Renderer/WorkflowRenderer.cpp b/src/Renderer/WorkflowRenderer.cpp
index 1e7d344..6a162b9 100644
--- a/src/Renderer/WorkflowRenderer.cpp
+++ b/src/Renderer/WorkflowRenderer.cpp
@@ -23,6 +23,14 @@
 //Allow PRId64 to be defined:
 #define __STDC_FORMAT_MACROS
 
+#include <QDomElement>
+#include <QThread>
+#include <QWaitCondition>
+#include <inttypes.h>
+
+#include "VLCMedia.h"
+#include "VLCMediaPlayer.h"
+
 #include "WorkflowRenderer.h"
 
 #include "Media/Clip.h"
@@ -33,16 +41,8 @@
 #include "Workflow/MainWorkflow.h"
 #include "Gui/preview/RenderWidget.h"
 #include "Settings/SettingsManager.h"
-#include "VLCMedia.h"
-#include "VLCMediaPlayer.h"
 #include "Tools/VlmcDebug.h"
 #include "Workflow/Types.h"
-#include "timeline/Timeline.h"
-
-#include <QDomElement>
-#include <QThread>
-#include <QWaitCondition>
-#include <inttypes.h>
 
 WorkflowRenderer::WorkflowRenderer( Backend::IBackend* backend ) :
             m_mainWorkflow( MainWorkflow::getInstance() ),



More information about the Vlmc-devel mailing list