[vlmc-devel] commit: Fix forward declaration of QXMLStreamReader, breaks on Mac OS; see a discussion here: http://lists.trolltech.com/qt-interest/2008-07/ thread00798-0.html (Rohit Yadav )
git at videolan.org
git at videolan.org
Mon Jun 7 16:33:51 CEST 2010
vlmc | branch: master | Rohit Yadav <rohityadav89 at gmail.com> | Thu May 27 19:35:29 2010 +0200| [e99422b5e36d718614f2ab3d437447d5b7941b17] | committer: Hugo Beauzée-Luyssen
Fix forward declaration of QXMLStreamReader, breaks on Mac OS; see a discussion here: http://lists.trolltech.com/qt-interest/2008-07/thread00798-0.html
Signed-off-by: Hugo Beauzée-Luyssen <beauze.h at gmail.com>
> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=e99422b5e36d718614f2ab3d437447d5b7941b17
---
src/Gui/project/GuiProjectManager.h | 1 +
src/Gui/timeline/Timeline.cpp | 1 -
src/Gui/timeline/Timeline.h | 1 +
src/Library/Library.cpp | 1 -
src/Library/Library.h | 2 +-
src/Library/MediaContainer.h | 2 +-
src/Media/Clip.cpp | 2 --
src/Media/Clip.h | 3 +--
src/Media/Media.cpp | 1 -
src/Media/Media.h | 3 +--
src/Settings/SettingsManager.cpp | 1 -
src/Settings/SettingsManager.h | 2 +-
src/Workflow/MainWorkflow.cpp | 1 -
src/Workflow/MainWorkflow.h | 2 +-
src/Workflow/TrackHandler.cpp | 1 -
src/Workflow/TrackHandler.h | 3 +--
src/Workflow/TrackWorkflow.cpp | 1 -
src/Workflow/TrackWorkflow.h | 1 +
18 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/src/Gui/project/GuiProjectManager.h b/src/Gui/project/GuiProjectManager.h
index 44930e3..f38fc6b 100644
--- a/src/Gui/project/GuiProjectManager.h
+++ b/src/Gui/project/GuiProjectManager.h
@@ -23,6 +23,7 @@
#ifndef GUIPROJECTMANAGER_H
#define GUIPROJECTMANAGER_H
+#include <QXmlStreamWriter>
#include "ProjectManager.h"
class QTimer;
diff --git a/src/Gui/timeline/Timeline.cpp b/src/Gui/timeline/Timeline.cpp
index 97ab1c7..8614d2d 100644
--- a/src/Gui/timeline/Timeline.cpp
+++ b/src/Gui/timeline/Timeline.cpp
@@ -31,7 +31,6 @@
#include <QHBoxLayout>
#include <QDomElement>
#include <QScrollBar>
-#include <QXmlStreamWriter>
#include <QtDebug>
diff --git a/src/Gui/timeline/Timeline.h b/src/Gui/timeline/Timeline.h
index ffafe3a..5e0d92b 100644
--- a/src/Gui/timeline/Timeline.h
+++ b/src/Gui/timeline/Timeline.h
@@ -26,6 +26,7 @@
#include "vlmc.h"
#include "ui_Timeline.h"
#include "Workflow/MainWorkflow.h"
+#include <QXmlStreamWriter>
class TracksScene;
class TracksView;
diff --git a/src/Library/Library.cpp b/src/Library/Library.cpp
index 367bb96..dd2eac1 100644
--- a/src/Library/Library.cpp
+++ b/src/Library/Library.cpp
@@ -36,7 +36,6 @@
#include <QDomElement>
#include <QHash>
#include <QUuid>
-#include <QXmlStreamWriter>
void
Library::loadProject( const QDomElement& doc )
diff --git a/src/Library/Library.h b/src/Library/Library.h
index d112e97..837db92 100644
--- a/src/Library/Library.h
+++ b/src/Library/Library.h
@@ -35,8 +35,8 @@
#include <QObject>
#include <QAtomicInt>
+#include <QXmlStreamWriter>
-class QXmlStreamWriter;
class QDomElement;
class Clip;
diff --git a/src/Library/MediaContainer.h b/src/Library/MediaContainer.h
index fe638e2..e610d81 100644
--- a/src/Library/MediaContainer.h
+++ b/src/Library/MediaContainer.h
@@ -26,11 +26,11 @@
#include <QHash>
#include <QObject>
#include <QUuid>
+#include <QXmlStreamWriter>
class Media;
class Clip;
class QFileInfo;
-class QXmlStreamWriter;
class QDomElement;
class MediaContainer : public QObject
diff --git a/src/Media/Clip.cpp b/src/Media/Clip.cpp
index 9026c24..2068810 100644
--- a/src/Media/Clip.cpp
+++ b/src/Media/Clip.cpp
@@ -30,8 +30,6 @@
#include "Library.h"
#include "Media.h"
-#include <QXmlStreamWriter>
-
const int Clip::DefaultFPS = 30;
Clip::Clip( Media *media, qint64 begin /*= 0*/, qint64 end /*= -1*/, const QString& uuid /*= QString()*/ ) :
diff --git a/src/Media/Clip.h b/src/Media/Clip.h
index a6f9ad9..a2439d8 100644
--- a/src/Media/Clip.h
+++ b/src/Media/Clip.h
@@ -31,12 +31,11 @@
#include <QObject>
#include <QStringList>
#include <QUuid>
+#include <QXmlStreamWriter>
class MediaContainer;
class Media;
-class QXmlStreamWriter;
-
class Clip : public QObject
{
Q_OBJECT
diff --git a/src/Media/Media.cpp b/src/Media/Media.cpp
index 1bb6c00..b9b6f46 100644
--- a/src/Media/Media.cpp
+++ b/src/Media/Media.cpp
@@ -31,7 +31,6 @@
#include "VLCMedia.h"
#include "Clip.h"
-#include <QXmlStreamWriter>
#include <QtDebug>
#include <QUrl>
diff --git a/src/Media/Media.h b/src/Media/Media.h
index bbc814d..8a62fef 100644
--- a/src/Media/Media.h
+++ b/src/Media/Media.h
@@ -36,6 +36,7 @@
#include <QObject>
#include <QFileInfo>
#include <QHash>
+#include <QXmlStreamWriter>
#ifdef WITH_GUI
#include "media/GuiMedia.h"
@@ -47,8 +48,6 @@ namespace LibVLCpp
}
class Clip;
-class QXmlStreamWriter;
-
/**
* Represents a basic container for media informations.
*/
diff --git a/src/Settings/SettingsManager.cpp b/src/Settings/SettingsManager.cpp
index 1459476..e140d2b 100644
--- a/src/Settings/SettingsManager.cpp
+++ b/src/Settings/SettingsManager.cpp
@@ -27,7 +27,6 @@
#include <QSettings>
#include <QWriteLocker>
#include <QReadLocker>
-#include <QXmlStreamWriter>
#include <QStringList>
#include <QtDebug>
diff --git a/src/Settings/SettingsManager.h b/src/Settings/SettingsManager.h
index db28fdd..602b336 100644
--- a/src/Settings/SettingsManager.h
+++ b/src/Settings/SettingsManager.h
@@ -31,9 +31,9 @@
#include <QObject>
#include <QReadWriteLock>
#include <QVariant>
+#include <QXmlStreamWriter>
class SettingValue;
-class QXmlStreamWriter;
class QDomElement;
diff --git a/src/Workflow/MainWorkflow.cpp b/src/Workflow/MainWorkflow.cpp
index 66f8d88..2845e08 100644
--- a/src/Workflow/MainWorkflow.cpp
+++ b/src/Workflow/MainWorkflow.cpp
@@ -33,7 +33,6 @@
#include "SettingsManager.h"
#include <QDomElement>
-#include <QXmlStreamWriter>
LightVideoFrame *MainWorkflow::blackOutput = NULL;
diff --git a/src/Workflow/MainWorkflow.h b/src/Workflow/MainWorkflow.h
index 2d4f096..db7a637 100644
--- a/src/Workflow/MainWorkflow.h
+++ b/src/Workflow/MainWorkflow.h
@@ -26,12 +26,12 @@
#include "Singleton.hpp"
#include "AudioClipWorkflow.h"
+#include <QXmlStreamWriter>
class QDomDocument;
class QDomElement;
class QMutex;
class QReadWriteLock;
-class QXmlStreamWriter;
class Clip;
class ClipHelper;
diff --git a/src/Workflow/TrackHandler.cpp b/src/Workflow/TrackHandler.cpp
index 7058ce0..85b156b 100644
--- a/src/Workflow/TrackHandler.cpp
+++ b/src/Workflow/TrackHandler.cpp
@@ -26,7 +26,6 @@
#include <QDomDocument>
#include <QDomElement>
-#include <QXmlStreamWriter>
LightVideoFrame* TrackHandler::nullOutput = NULL;
diff --git a/src/Workflow/TrackHandler.h b/src/Workflow/TrackHandler.h
index e059683..54db97e 100644
--- a/src/Workflow/TrackHandler.h
+++ b/src/Workflow/TrackHandler.h
@@ -24,14 +24,13 @@
#define TRACKHANDLER_H
#include <QObject>
+#include <QXmlStreamWriter>
#include "Toggleable.hpp"
#include "MainWorkflow.h"
class ClipHelper;
class TrackWorkflow;
-class QXmlStreamWriter;
-
class TrackHandler : public QObject
{
Q_OBJECT
diff --git a/src/Workflow/TrackWorkflow.cpp b/src/Workflow/TrackWorkflow.cpp
index 155ec25..7d26e47 100644
--- a/src/Workflow/TrackWorkflow.cpp
+++ b/src/Workflow/TrackWorkflow.cpp
@@ -34,7 +34,6 @@
#include <QReadWriteLock>
#include <QDomDocument>
#include <QDomElement>
-#include <QXmlStreamWriter>
#include <QtDebug>
diff --git a/src/Workflow/TrackWorkflow.h b/src/Workflow/TrackWorkflow.h
index 3f3dab6..021ecf2 100644
--- a/src/Workflow/TrackWorkflow.h
+++ b/src/Workflow/TrackWorkflow.h
@@ -27,6 +27,7 @@
#include "StackedBuffer.hpp"
#include <QObject>
+#include <QXmlStreamWriter>
class ClipWorkflow;
class LightVideoFrame;
More information about the Vlmc-devel
mailing list