Clean up include files.

src/GUI/About.cpp

@@ -20,10 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include <QApplication>
 #include <QFile>
 #include <QString>
-#include <QCoreApplication>
-#include <QtDebug>
+#include <QPlainTextEdit>
 #include "About.h"
 
 About* About::m_instance = NULL;

src/GUI/About.h

@@ -23,10 +23,11 @@
 #ifndef ABOUT_H
 #define ABOUT_H
 
-#include <QApplication>
-#include <QPlainTextEdit>
+#include <QDialog>
 #include "ui_About.h"
 
+class QPlainTextEdit;
+
 class About : public QDialog
 {
     Q_OBJECT

src/GUI/AbstractGraphicsMediaItem.cpp

@@ -23,6 +23,7 @@
 #include "AbstractGraphicsMediaItem.h"
 #include "TracksView.h"
 
+#include "Clip.h"
 #include "Commands.h"
 
 AbstractGraphicsMediaItem::AbstractGraphicsMediaItem() :

src/GUI/AbstractGraphicsMediaItem.h

@@ -25,13 +25,12 @@
 
 #include <QGraphicsItem>
 #include <QUuid>
-#include <QCursor>
 #include "GraphicsTrack.hpp"
-#include "Clip.h"
 
 #define RESIZE_ZONE 7
 
 class TracksView;
+class Clip;
 
 class AbstractGraphicsMediaItem : public QObject, public QGraphicsItem
 {

src/GUI/DockWidgetManager.cpp

@@ -22,8 +22,10 @@
 #include <QtDebug>
 #include <QApplication>
 #include <QMap>
+#include <QDockWidget>
 
 #include "DockWidgetManager.h"
+#include "MainWindow.h"
 
 DockWidgetManager *DockWidgetManager::m_instance = 0;
 

src/GUI/DockWidgetManager.h

@@ -28,7 +28,6 @@
 #include <QDockWidget>
 #include <QString>
 #include <QMap>
-#include "MainWindow.h"
 
 class MainWindow;
 

src/GUI/GraphicsMovieItem.cpp

@@ -24,6 +24,7 @@
 #include <QLinearGradient>
 #include <QDebug>
 #include <QTime>
+#include <QFontMetrics>
 #include "GraphicsMovieItem.h"
 #include "TracksView.h"
 #include "Timeline.h"

src/GUI/GraphicsMovieItem.h

@@ -23,7 +23,6 @@
 #ifndef GRAPHICSMOVIEITEM_H
 #define GRAPHICSMOVIEITEM_H
 
-#include <QFontMetrics>
 #include "AbstractGraphicsMediaItem.h"
 #include "Clip.h"
 #include "TracksView.h"

src/GUI/Import.cpp

@@ -20,11 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include <QTime>
+
 #include "Import.h"
 #include "ui_Import.h"
+#include "PreviewWidget.h"
+#include "TagWidget.h"
+#include "ImportMediaCellView.h"
+#include "Media.h"
 #include "ClipRenderer.h"
 #include "Library.h"
-#include "QTime"
 
 Import::Import(QWidget *parent) :
     QDialog( parent ), m_ui( new Ui::Import )

src/GUI/Import.h

@@ -24,10 +24,11 @@
 #define IMPORT_H
 
 #include <QDialog>
-#include "PreviewWidget.h"
-#include "Media.h"
-#include "TagWidget.h"
-#include "ImportMediaCellView.h"
+
+class PreviewWidget;
+class TagWidget;
+class ImportMediaCellView;
+class Media;
 
 namespace Ui
 {

src/GUI/MainWindow.cpp

@@ -37,12 +37,19 @@
 #include "MainWindow.h"
 #include "Library.h"
 #include "Timeline.h"
+#include "TracksView.h"
 #include "About.h"
+#include "DockWidgetManager.h"
+#include "ImportController.h"
+#include "MainWorkflow.h"
+#include "WorkflowFileRenderer.h"
 #include "WorkflowRenderer.h"
 #include "ClipRenderer.h"
+#include "EffectsEngine.h"
 #include "UndoStack.h"
 #include "ClipProperty.h"
 #include "PreviewWidget.h"
+#include "ProjectWizard.h"
 #include "PreferenceWidget.h"
 #include "ProjectPreferences.h"
 #include "ProjectManager.h"
@@ -56,6 +63,7 @@
 #include "LanguagePreferences.h"
 #include "ProjectManager.h"
 #include "KeyboardShortcut.h"
+#include "Settings.h"
 #include "SettingValue.h"
 #include "SettingsManager.h"
 #include "VlmcDebug.h"

src/GUI/MainWindow.h

@@ -31,16 +31,12 @@
 #include "vlmc.h"
 #include "ui_MainWindow.h"
 
-#include "DockWidgetManager.h"
-#include "LanguagePreferences.h"
-#include "Timeline.h"
-#include "WorkflowFileRenderer.h"
-#include "PreviewWidget.h"
-#include "Settings.h"
-#include "EffectsEngine.h"
-#include "MainWorkflow.h"
-#include "ProjectWizard.h"
-#include "ImportController.h"
+class Timeline;
+class PreviewWidget;
+class Settings;
+class ProjectWizard;
+class ImportController;
+class WorkflowFileRenderer;
 
 class MainWindow : public QMainWindow
 {

src/GUI/PreviewRuler.h

 /*****************************************************************************
  * PreviewRuler.h : Slider/Ruler used into the PreviewWidget
- * with backward compatibility with QAbstractSlider.
  *****************************************************************************
  * Copyright (C) 2008-2009 the VLMC team
  *
@@ -24,9 +23,8 @@
 #ifndef PREVIEWRULER_H
 #define PREVIEWRULER_H
 
-#include <QAbstractSlider>
+#include <QWidget>
 #include <QPaintEvent>
-#include <QPainter>
 #include "GenericRenderer.h"
 
 #define MARK_XSMALL 3

src/GUI/PreviewWidget.cpp

@@ -21,12 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <QUrl>
 #include <QtDebug>
-#include <QMetaMethod>
 #include "PreviewWidget.h"
 #include "ui_PreviewWidget.h"
-#include "Library.h"
 #include "ClipRenderer.h"
 
 PreviewWidget::PreviewWidget( GenericRenderer* genericRenderer, QWidget *parent ) :

src/GUI/PreviewWidget.h

@@ -26,9 +26,10 @@
 
 #include <QWidget>
 #include "Workflow/MainWorkflow.h"
-#include "GenericRenderer.h"
 #include "PreviewRuler.h"
 
+class GenericRenderer;
+
 namespace Ui {
     class PreviewWidget;
 }

src/GUI/Timeline.cpp

@@ -26,6 +26,9 @@
 #include "Timeline.h"
 #include "TracksView.h"
 #include "TracksScene.h"
+#include "TracksControls.h"
+#include "TracksRuler.h"
+#include "WorkflowRenderer.h"
 
 Timeline*   Timeline::m_instance = NULL;
 

src/GUI/Timeline.h

@@ -25,13 +25,13 @@
 
 #include "vlmc.h"
 #include "ui_Timeline.h"
-#include "TracksRuler.h"
-#include "TracksControls.h"
 #include "Workflow/MainWorkflow.h"
-#include "WorkflowRenderer.h"
 
 class TracksScene;
 class TracksView;
+class TracksControls;
+class TracksRuler;
+class WorkflowRenderer;
 
 class Timeline : public QWidget
 {

src/GUI/TracksView.cpp

@@ -25,7 +25,6 @@
 #include <QWheelEvent>
 #include <QGraphicsLinearLayout>
 #include <QGraphicsWidget>
-#include <QGraphicsSceneDragDropEvent>
 #include <QtDebug>
 #include "TracksView.h"
 #include "Library.h"
@@ -33,6 +32,7 @@
 #include "GraphicsCursorItem.h"
 #include "Commands.h"
 #include "GraphicsTrack.hpp"
+#include "WorkflowRenderer.h"
 
 TracksView::TracksView( QGraphicsScene* scene, MainWorkflow* mainWorkflow, WorkflowRenderer* renderer, QWidget* parent )
         : QGraphicsView( scene, parent ), m_scene( scene ), m_mainWorkflow( mainWorkflow ),

src/GUI/TracksView.h

@@ -25,22 +25,18 @@
 
 #include <QWidget>
 #include <QGraphicsView>
-#include <QGraphicsLineItem>
-#include <QGraphicsLinearLayout>
-#include <QGraphicsWidget>
-#include <QWheelEvent>
-#include <QGraphicsSceneDragDropEvent>
-#include <QApplication>
-#include <QVector>
 #include "vlmc.h"
-#include "GraphicsCursorItem.h"
 #include "MainWorkflow.h"
-#include "TrackWorkflow.h"
 #include "AbstractGraphicsMediaItem.h"
-#include "WorkflowRenderer.h"
+#include "GraphicsCursorItem.h"
+
+class QWheelEvent;
+class QGraphicsWidget;
+class QGraphicsLinearLayout;
 
-class GraphicsMovieItem;
 class TracksScene;
+class GraphicsMovieItem;
+class WorkflowRenderer;
 
 class TracksView : public QGraphicsView
 {

src/GUI/UndoStack.cpp

@@ -21,6 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include <QUndoStack>
+#include <QUndoCommand>
+
 #include "UndoStack.h"
 #include "ProjectManager.h"
 #include "SettingsManager.h"

src/GUI/UndoStack.h

@@ -23,13 +23,14 @@
 #ifndef UNDOSTACK_H
 #define UNDOSTACK_H
 
-#include <QUndoStack>
 #include <QUndoView>
-#include <QUndoCommand>
 
 #include "KeyboardShortcutHelper.h"
 #include "QSingleton.hpp"
 
+class QUndoStack;
+class QUndoCommand;
+
 class UndoStack : public QUndoView, public QSingleton<UndoStack>
 {
     Q_OBJECT

src/GUI/WorkflowFileRendererDialog.cpp

@@ -21,11 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include "vlmc.h"
 #include "WorkflowFileRendererDialog.h"
 
-#define VIDEOWIDTH 640
-#define VIDEOHEIGHT 480
-
 WorkflowFileRendererDialog::WorkflowFileRendererDialog()
 {
     m_ui.setupUi( this );

src/GUI/library/MediaLibraryWidget.cpp

@@ -21,6 +21,11 @@
  *****************************************************************************/
 
 #include "MediaLibraryWidget.h"
+#include "StackViewController.h"
+#include "MediaListViewController.h"
+
+#include "Media.h"
+#include "Clip.h"
 
 MediaLibraryWidget::MediaLibraryWidget( QWidget* parent ) : QWidget( parent )
 {

src/GUI/library/MediaLibraryWidget.h

@@ -25,10 +25,10 @@
 
 #include <QWidget>
 
-#include "StackViewController.h"
-#include "MediaListViewController.h"
-#include "Media.h"
-#include "Clip.h"
+class StackViewController;
+class ViewController;
+class Media;
+class Clip;
 
 class MediaLibraryWidget : public QWidget
 {

src/GUI/settings/AudioProjectPreferences.cpp

@@ -20,11 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include <QDebug>
+
 #include "AudioProjectPreferences.h"
 #include "SettingsManager.h"
 
-#include "QDebug"
-
 AudioProjectPreferences::AudioProjectPreferences( QWidget *parent )
     : PreferenceWidget( parent )
 {

src/GUI/settings/AudioProjectPreferences.h

@@ -24,7 +24,6 @@
 #define AUDIOPROJECTPREFERENCES_H
 
 #include <QWidget>
-#include <QSettings>
 #include "PreferenceWidget.h"
 #include "ui_AudioProjectPreferences.h"
 

src/GUI/settings/PreferenceWidget.h

@@ -24,11 +24,8 @@
 #ifndef PREFERENCEWIDGET_H
 #define PREFERENCEWIDGET_H
 
-#include <QHash>
-#include <QVariant>
-#include <QString>
 #include <QWidget>
-#include <QVariant>
+#include <QString>
 
 class   PreferenceWidget : public QWidget
 {

src/GUI/settings/VideoProjectPreferences.cpp

@@ -20,11 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include <QDebug>
+
 #include "VideoProjectPreferences.h"
 #include "SettingsManager.h"
 
-#include "QDebug"
-
 VideoProjectPreferences::VideoProjectPreferences( QWidget *parent )
     : PreferenceWidget( parent )
 {

src/GUI/settings/VideoProjectPreferences.h

@@ -24,7 +24,6 @@
 #define VIDEOPROJECTPREFERENCES_H
 
 #include <QWidget>
-#include <QSettings>
 #include "PreferenceWidget.h"
 #include "ui_VideoProjectPreferences.h"
 

src/GUI/wizard/ProjectWizard.cpp

@@ -22,16 +22,11 @@
  *****************************************************************************/
 
 #include <QString>
-#include <QFileDialog>
 #include <QMessageBox>
 #include <QWizardPage>
 #include "ProjectManager.h"
 #include "ProjectWizard.h"
-#include "ProjectPreferences.h"
-#include "VideoProjectPreferences.h"
-#include "AudioProjectPreferences.h"
 #include "SettingsManager.h"
-#include "PageFactory.h"
 #include "WelcomePage.h"
 #include "OpenPage.h"
 #include "GeneralPage.h"

src/Library/Library.cpp

@@ -28,8 +28,13 @@
 
 #include <QtDebug>
 #include <QMessageBox>
+#include <QDomElement>
+#include <QUuid>
+#include <QHash>
 
 #include "Library.h"
+#include "Media.h"
+#include "Clip.h"
 #include "MetaDataManager.h"
 
 Library::Library()

src/Library/Library.h

@@ -32,15 +32,15 @@
 #include <QObject>
 #include <QHash>
 #include <QUuid>
-#include <QFileInfo>
-#include <QMutex>
-#include <QMutexLocker>
-#include <QDomElement>
 
-#include "Media.h"
-#include "Clip.h"
 #include "Singleton.hpp"
 
+class QDomDocument;
+class QDomElement;
+
+class Media;
+class Clip;
+
 class   Library : public QObject, public Singleton<Library>
 {
     Q_OBJECT

src/Project/ProjectManager.cpp

@@ -20,11 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <QFileDialog>
 #include <QtDebug>
+#include <QFileDialog>
 #include <QSettings>
 #include <QMessageBox>
-#include <QApplication>
+#include <QTimer>
 
 #include <errno.h>
 #include <signal.h>

src/Project/ProjectManager.h

@@ -23,7 +23,6 @@
 #ifndef PROJECTMANAGER_H
 #define PROJECTMANAGER_H
 
-#include <QFile>
 #include <QObject>
 #include <QDomDocument>
 #include <QStringList>
@@ -31,6 +30,8 @@
 
 #include "Singleton.hpp"
 
+class QFile;
+
 class   ProjectManager : public QObject, public Singleton<ProjectManager>
 {
     Q_OBJECT

src/Renderer/WorkflowFileRenderer.cpp

@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include "vlmc.h"
 #include "WorkflowFileRenderer.h"
 #include "SettingsManager.h"
 

src/Workflow/ClipWorkflow.h

@@ -23,12 +23,6 @@
 #ifndef CLIPWORKFLOW_H
 #define CLIPWORKFLOW_H
 
-//TODO: THIS HAS TO GO REALLY REALLY REALLY SOON !!!!
-//FIXME:
-//UGLY:
-#define VIDEOWIDTH 640
-#define VIDEOHEIGHT 480
-
 #include <QReadWriteLock>
 #include <QMutex>
 #include <QObject>

src/Workflow/MainWorkflow.cpp

@@ -23,16 +23,12 @@
 
 #include <QtDebug>
 
+#include "vlmc.h"
 #include "MainWorkflow.h"
 #include "TrackWorkflow.h"
 #include "TrackHandler.h"
 #include "Library.h"
 
-//JUST FOR THE DEFINES !
-//TODO:
-//FIXME: remove this !
-#include "ClipWorkflow.h"
-
 LightVideoFrame*     MainWorkflow::blackOutput = NULL;
 
 MainWorkflow::MainWorkflow( int trackCount ) :

src/Workflow/VideoClipWorkflow.cpp

@@ -20,6 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#include "vlmc.h"
 #include "VideoClipWorkflow.h"
 
 VideoClipWorkflow::VideoClipWorkflow( Clip* clip ) : ClipWorkflow( clip )

src/vlmc.h

@@ -36,6 +36,12 @@
 #define SleepMS( x ) Sleep( x )
 #endif
 
+//TODO: THIS HAS TO GO REALLY REALLY REALLY SOON !!!!
+//FIXME:
+//UGLY:
+#define VIDEOWIDTH 640
+#define VIDEOHEIGHT 480
+
 enum ToolButtons
 {
     TOOL_DEFAULT,