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 20798f90c1acb9092190cf778ae63b4a45d4252e..8b2e6da2aa1830bac7f29c433aeeef74f15c7286 100644 (file)
--- a/src/trackview.h
+++ b/src/trackview.h
@@ -29,7 +29,6 @@
 #include <QGraphicsLineItem>
 #include <QDomElement>
 
-#define FRAME_SIZE 90
 
 #include "customtrackscene.h"
 #include "ui_timeline_ui.h"
@@ -45,10 +44,10 @@ 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();
@@ -71,6 +70,7 @@ private:
     Ui::TimeLine_UI *view;
     CustomRuler *m_ruler;
     CustomTrackView *m_trackview;
+    QList <QString> m_invalidProducers;
     double m_scale;
     int m_projectTracks;
     QString m_editMode;
@@ -84,7 +84,7 @@ private:
     QVBoxLayout *m_tracksAreaLayout;
     QString m_documentErrors;
     void parseDocument(QDomDocument doc);
-    int slotAddProjectTrack(int ix, QDomElement xml);
+    int slotAddProjectTrack(int ix, QDomElement xml, bool locked);
     DocClipBase *getMissingProducer(const QString id) const;
 
 private slots:
@@ -92,7 +92,7 @@ private slots:
     void moveCursorPos(int pos);
     void slotTransitionItemSelected(Transition*, bool update);
     void slotRebuildTrackHeaders();
-
+    void slotChangeTrackLock(int ix, bool lock);
 
 signals:
     void mousePosition(int);