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 0851011c961c9cbf1b3dad6dce4522063c2d50fd..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;
@@ -84,9 +84,9 @@ public:
      *
      * If the clip wasn't added before, it tries to add it to the project. */
     bool addClipInfo(QDomElement elem, QDomElement orig, const QString &clipId);
-    void slotAddClipList(const KUrl::List urls, stringMap data = stringMap());
+    void slotAddClipList(const KUrl::List &urls, const stringMap &data = stringMap());
     void deleteClip(const QString &clipId);
-    int getFramePos(QString duration);
+    int getFramePos(const QString &duration);
     DocClipBase *getBaseClip(const QString &clipId);
     void updateClip(const QString &id);
 
@@ -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;
@@ -196,12 +196,12 @@ private:
     QList <TrackInfo> m_tracksList;
     void setNewClipResource(const QString &id, const QString &path);
     QString searchFileRecursively(const QDir &dir, const QString &matchSize, const QString &matchHash) const;
-    void moveProjectData(KUrl url);
+    void moveProjectData(const KUrl &url);
     bool checkDocumentClips(QDomNodeList infoproducers);
 
     /** @brief Creates a new project. */
     QDomDocument createEmptyDocument(int videotracks, int audiotracks);
-    QDomDocument createEmptyDocument(QList <TrackInfo> tracks);
+    QDomDocument createEmptyDocument(const QList<TrackInfo> &tracks);
     /** @brief Saves effects embedded in project file.
     *   @return True if effects were imported.  */
     bool saveCustomEffects(const QDomNodeList &customeffects);
@@ -222,7 +222,7 @@ public slots:
      * @param mod (optional) true if the document has to be saved */
     void setModified(bool mod = true);
     void checkProjectClips(bool displayRatioChanged = false, bool fpsChanged = false);
-    void slotAddClipFile(const KUrl &url, stringMap data);
+    void slotAddClipFile(const KUrl &url, const stringMap &data);
 
 private slots:
     void slotAutoSave();