Various changes for getting an OpenGL context (almost) everywhere it is needed.

[kdenlive] / src / kdenlivedoc.h

diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h
index e9688bc97e80ed6d0be9402603a73c5c9f078ef1..8acf632842b74486dfb6bbaaae218274b98c9a72 100644 (file)
--- a/src/kdenlivedoc.h
+++ b/src/kdenlivedoc.h
@@ -21,15 +21,11 @@
 #ifndef KDENLIVEDOC_H
 #define KDENLIVEDOC_H
 
-#include <qdom.h>
-#include <QString>
+#include <QtXml/qdom.h>
 #include <QMap>
 #include <QList>
 #include <QDir>
 #include <QObject>
-#include <QUndoGroup>
-#include <QUndoStack>
-#include <QTimer>
 
 #include <KUrl>
 #include <kautosavefile.h>
@@ -47,13 +43,17 @@ class TrackInfo;
 
 class KTextEdit;
 class KProgressDialog;
+class QGLWidget;
+class QUndoGroup;
+class QTimer;
+class QUndoStack;
 
 class KdenliveDoc: public QObject
 {
     Q_OBJECT
 public:
 
-    KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QMap <QString, QString>& properties, const QMap <QString, QString>& metadata, const QPoint &tracks, Render *render, KTextEdit *notes, bool *openBackup, MainWindow *parent = 0, KProgressDialog *progressDialog = 0);
+    KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QMap <QString, QString>& properties, const QMap <QString, QString>& metadata, const QPoint &tracks, Render *render, KTextEdit *notes, bool *openBackup, QGLWidget *glContext, MainWindow *parent = 0, KProgressDialog *progressDialog = 0);
     ~KdenliveDoc();
     QDomNodeList producersList();
     double fps() const;
@@ -107,7 +107,7 @@ public:
 
     /** @brief Returns the project folder, used to store project files. */
     KUrl projectFolder() const;
-    void syncGuides(QList <Guide *> guides);
+    void syncGuides(const QList <Guide *> &guides);
     void setZoom(int horizontal, int vertical);
     QPoint zoom() const;
     double dar() const;