const modifiers are useless on integral return types [PATCH by Ray Lehtiniemi]

[kdenlive] / src / trackview.h

diff --git a/src/trackview.h b/src/trackview.h
index 09304cb76b1045098e745f30995751f2463f0e9d..8b2e6da2aa1830bac7f29c433aeeef74f15c7286 100644 (file)
--- a/src/trackview.h
+++ b/src/trackview.h
@@ -27,48 +27,54 @@
 #include <QGroupBox>
 #include <QGraphicsScene>
 #include <QGraphicsLineItem>
+#include <QDomElement>
 
-#define FRAME_SIZE 90
 
+#include "customtrackscene.h"
 #include "ui_timeline_ui.h"
-#include "customruler.h"
-#include "kdenlivedoc.h"
-#include "customtrackview.h"
+
 class ClipItem;
+class Transition;
+class CustomTrackView;
+class KdenliveDoc;
+class CustomRuler;
+class DocClipBase;
 
 class TrackView : public QWidget {
     Q_OBJECT
 
 public:
-    TrackView(KdenliveDoc *doc, QWidget *parent = 0);
+    explicit TrackView(KdenliveDoc *doc, QWidget *parent = 0);
 
-    const double zoomFactor() const;
-    const int mapLocalToValue(int x) const;
+    double zoomFactor() const;
+    int mapLocalToValue(int x) const;
     void setEditMode(const QString & editMode);
     const QString & editMode() const;
     QGraphicsScene *projectScene();
     CustomTrackView *projectView();
-    int duration();
-    int tracksNumber();
+    int duration() const;
+    int tracksNumber() const;
     KdenliveDoc *document();
     void refresh() ;
-    int outPoint();
-    int inPoint();
+    int outPoint() const;
+    int inPoint() const;
+    int fitZoom() const;
 
 public slots:
-    void slotDeleteClip(int clipId);
+    void slotDeleteClip(const QString &clipId);
+    void slotChangeZoom(int factor);
+    void setDuration(int dur);
+    void slotSetZone(QPoint p);
 
 private:
     Ui::TimeLine_UI *view;
     CustomRuler *m_ruler;
     CustomTrackView *m_trackview;
+    QList <QString> m_invalidProducers;
     double m_scale;
-    int m_projectDuration;
     int m_projectTracks;
     QString m_editMode;
-    QGraphicsScene *m_scene;
-    uint m_currentZoom;
-
+    CustomTrackScene *m_scene;
 
     KdenliveDoc *m_doc;
     QVBoxLayout *m_tracksLayout;
@@ -76,21 +82,26 @@ private:
     QScrollArea *m_scrollArea;
     QFrame *m_scrollBox;
     QVBoxLayout *m_tracksAreaLayout;
+    QString m_documentErrors;
     void parseDocument(QDomDocument doc);
-    int slotAddAudioTrack(int ix, QDomElement xml);
-    int slotAddVideoTrack(int ix, QDomElement xml);
+    int slotAddProjectTrack(int ix, QDomElement xml, bool locked);
+    DocClipBase *getMissingProducer(const QString id) const;
 
 private slots:
-    void slotChangeZoom(int factor);
-    void slotZoomIn();
-    void slotZoomOut();
     void setCursorPos(int pos);
     void moveCursorPos(int pos);
-    void slotClipItemSelected(ClipItem*);
+    void slotTransitionItemSelected(Transition*, bool update);
+    void slotRebuildTrackHeaders();
+    void slotChangeTrackLock(int ix, bool lock);
+
 signals:
     void mousePosition(int);
     void cursorMoved();
-    void clipItemSelected(ClipItem*);
+    void transitionItemSelected(Transition*, bool);
+    void zoneMoved(int, int);
+    void insertTrack(int);
+    void deleteTrack(int);
+    void changeTrack(int);
 };
 
 #endif