cleanup & fix crash on project saving with Qt 4.5:

[kdenlive] / src / monitor.h

diff --git a/src/monitor.h b/src/monitor.h
index 516c7679f3f76cc1ca3466e49123754aef32ba84..b141e7cc68c00e48405529e0d1d94009e0d6782f 100644 (file)
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -70,8 +70,8 @@ public:
     void resetSize();
     bool isActive() const;
     void pause();
-    void setupMenu(QMenu *goMenu, QMenu *markerMenu = NULL);
-    QDomDocument sceneList();
+    void setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMenu *markerMenu = NULL);
+    const QString sceneList();
     DocClipBase *activeClip();
     GenTime position();
     void checkOverlay();
@@ -112,7 +112,6 @@ private:
     GenTime getSnapForPos(bool previous);
 
 private slots:
-    void adjustRulerSize(int length);
     void seekCursor(int pos);
     void rendererStopped(int pos);
     void slotExtractCurrentFrame();
@@ -121,6 +120,7 @@ private slots:
     void slotSetSizeOneToTwo();
     void slotSaveZone();
     void slotSeek();
+    void setClipZone(QPoint pos);
 
 public slots:
     void slotOpenFile(const QString &);
@@ -136,8 +136,8 @@ public slots:
     void slotLoopZone();
     void slotForward(double speed = 0);
     void slotRewind(double speed = 0);
-    void slotRewindOneFrame();
-    void slotForwardOneFrame();
+    void slotRewindOneFrame(int diff = 1);
+    void slotForwardOneFrame(int diff = 1);
     void saveSceneList(QString path, QDomElement info = QDomElement());
     void slotStart();
     void slotEnd();
@@ -148,6 +148,7 @@ public slots:
     void slotZoneMoved(int start, int end);
     void slotSeekToNextSnap();
     void slotSeekToPreviousSnap();
+    void adjustRulerSize(int length);
 
 signals:
     void renderPosition(int);