[vlmc-devel] commit: Removing more inclusion of MainWorkflow.h ( Hugo Beauzée-Luyssen )

[git at videolan.org]

vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Mon Aug 23 00:21:03 2010 +0200| [79cf97d794ec201247fb323bdf93c17457fbbf18] | committer: Hugo Beauzée-Luyssen 

Removing more inclusion of MainWorkflow.h

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

 src/Gui/WorkflowFileRendererDialog.cpp |    9 +++++----
 src/Gui/WorkflowFileRendererDialog.h   |    3 ---
 src/Gui/timeline/GraphicsCursorItem.h  |    1 -
 src/Gui/timeline/GraphicsTrack.cpp     |    1 +
 src/Gui/timeline/TracksView.h          |   11 ++++++-----
 src/Renderer/GenericRenderer.h         |    2 +-
 src/Workflow/TrackWorkflow.cpp         |    1 +
 src/Workflow/TrackWorkflow.h           |    3 ++-
 8 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/Gui/WorkflowFileRendererDialog.cpp b/src/Gui/WorkflowFileRendererDialog.cpp
index 165621f..35e9055 100644
--- a/src/Gui/WorkflowFileRendererDialog.cpp
+++ b/src/Gui/WorkflowFileRendererDialog.cpp
@@ -21,8 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "vlmc.h"
 #include "WorkflowFileRendererDialog.h"
+
+#include "vlmc.h"
+#include "MainWorkflow.h"
 #include "WorkflowFileRenderer.h"
 
 WorkflowFileRendererDialog::WorkflowFileRendererDialog( WorkflowFileRenderer* renderer,
@@ -32,7 +34,6 @@ WorkflowFileRendererDialog::WorkflowFileRendererDialog( WorkflowFileRenderer* re
         m_renderer( renderer )
 {
     m_ui.setupUi( this );
-    m_workflow = MainWorkflow::getInstance();
     connect( m_ui.cancelButton, SIGNAL( clicked() ), m_renderer, SLOT( stop() ) );
     connect( m_ui.cancelButton, SIGNAL( clicked() ), this, SLOT( close() ) );
     connect( m_renderer, SIGNAL( renderComplete() ), this, SLOT( accept() ) );
@@ -64,6 +65,6 @@ void    WorkflowFileRendererDialog::updatePreview( const uchar* buff )
 void    WorkflowFileRendererDialog::frameChanged( qint64 frame )
 {
     m_ui.frameCounter->setText( tr("Rendering frame %1 / %2").arg(QString::number( frame ),
-                                    QString::number(m_workflow->getLengthFrame() ) ) );
-    setProgressBarValue( frame * 100 / m_workflow->getLengthFrame() );
+                                    QString::number(MainWorkflow::getInstance()->getLengthFrame() ) ) );
+    setProgressBarValue( frame * 100 / MainWorkflow::getInstance()->getLengthFrame() );
 }
diff --git a/src/Gui/WorkflowFileRendererDialog.h b/src/Gui/WorkflowFileRendererDialog.h
index 4093dfa..6177a38 100644
--- a/src/Gui/WorkflowFileRendererDialog.h
+++ b/src/Gui/WorkflowFileRendererDialog.h
@@ -26,8 +26,6 @@
 #include <QDialog>
 #include "ui_WorkflowFileRendererDialog.h"
 
-#include "MainWorkflow.h"
-
 class   WorkflowFileRenderer;
 
 class   WorkflowFileRendererDialog : public QDialog
@@ -41,7 +39,6 @@ public:
 
 private:
     Ui::WorkflowFileRendererDialog      m_ui;
-    MainWorkflow*                       m_workflow;
     quint32                             m_width;
     quint32                             m_height;
     WorkflowFileRenderer                *m_renderer;
diff --git a/src/Gui/timeline/GraphicsCursorItem.h b/src/Gui/timeline/GraphicsCursorItem.h
index 7c2f07a..e80180c 100644
--- a/src/Gui/timeline/GraphicsCursorItem.h
+++ b/src/Gui/timeline/GraphicsCursorItem.h
@@ -23,7 +23,6 @@
 #ifndef GRAPHICSCURSORITEM_H
 #define GRAPHICSCURSORITEM_H
 
-#include "MainWorkflow.h"
 #include "Types.h"
 #include <QObject>
 #include <QGraphicsItem>
diff --git a/src/Gui/timeline/GraphicsTrack.cpp b/src/Gui/timeline/GraphicsTrack.cpp
index ce258bf..429e62b 100644
--- a/src/Gui/timeline/GraphicsTrack.cpp
+++ b/src/Gui/timeline/GraphicsTrack.cpp
@@ -23,6 +23,7 @@
 #include <QList>
 #include "TracksView.h"
 #include "GraphicsTrack.h"
+#include "MainWorkflow.h"
 
 GraphicsTrack::GraphicsTrack( Workflow::TrackType type, quint32 trackNumber,
                               QGraphicsItem *parent ) : QGraphicsWidget( parent )
diff --git a/src/Gui/timeline/TracksView.h b/src/Gui/timeline/TracksView.h
index 8e61917..4a593a5 100644
--- a/src/Gui/timeline/TracksView.h
+++ b/src/Gui/timeline/TracksView.h
@@ -35,12 +35,13 @@ class QWheelEvent;
 class QGraphicsWidget;
 class QGraphicsLinearLayout;
 
-class TracksScene;
-class GraphicsMovieItem;
-class GraphicsAudioItem;
-class WorkflowRenderer;
+class   TracksScene;
+class   GraphicsMovieItem;
+class   GraphicsAudioItem;
+class   MainWorkflow;
+class   WorkflowRenderer;
 
-class ItemPosition
+class   ItemPosition
 {
 public:
     ItemPosition() : m_track( -1 ), m_time( -1 )
diff --git a/src/Renderer/GenericRenderer.h b/src/Renderer/GenericRenderer.h
index 2c5afd5..00158a1 100644
--- a/src/Renderer/GenericRenderer.h
+++ b/src/Renderer/GenericRenderer.h
@@ -30,7 +30,7 @@
 # include <QWidget>
 #endif
 
-#include "MainWorkflow.h"
+#include "Types.h"
 
 class   Clip;
 class   Media;
diff --git a/src/Workflow/TrackWorkflow.cpp b/src/Workflow/TrackWorkflow.cpp
index 47625f7..cdfc78f 100644
--- a/src/Workflow/TrackWorkflow.cpp
+++ b/src/Workflow/TrackWorkflow.cpp
@@ -27,6 +27,7 @@
 #include "ClipHelper.h"
 #include "AudioClipWorkflow.h"
 #include "ImageClipWorkflow.h"
+#include "MainWorkflow.h"
 #include "Media.h"
 #include "MixerInstance.h"
 #include "Types.h"
diff --git a/src/Workflow/TrackWorkflow.h b/src/Workflow/TrackWorkflow.h
index db95097..7e42d2b 100644
--- a/src/Workflow/TrackWorkflow.h
+++ b/src/Workflow/TrackWorkflow.h
@@ -24,13 +24,14 @@
 #define TRACKWORKFLOW_H
 
 #include "EffectsEngine.h"
-#include "MainWorkflow.h"
 #include "Types.h"
 
 #include <QObject>
 #include <QMap>
 #include <QXmlStreamWriter>
 
+class   Clip;
+class   ClipHelper;
 class   ClipWorkflow;
 
 class   QDomElement;