[PATCH 2/2] Ensure that all member variables have an m_ prefix

[kdenlive] / src / trackview.h

diff --git a/src/trackview.h b/src/trackview.h
index deaf1c26d476887f4722e07c73fd09b1eb197774..986e7d280c8650acd9b8888fca215fa1968c0bcc 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"
@@ -39,15 +38,15 @@ class Transition;
 class CustomTrackView;
 class KdenliveDoc;
 class CustomRuler;
+class DocClipBase;
 
-class TrackView : public QWidget {
+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;
     void setEditMode(const QString & editMode);
     const QString & editMode() const;
     QGraphicsScene *projectScene();
@@ -60,7 +59,6 @@ public:
     int inPoint() const;
     int fitZoom() const;
 
-
 public slots:
     void slotDeleteClip(const QString &clipId);
     void slotChangeZoom(int factor);
@@ -68,30 +66,28 @@ public slots:
     void slotSetZone(QPoint p);
 
 private:
-    Ui::TimeLine_UI *view;
+    Ui::TimeLine_UI m_view;
     CustomRuler *m_ruler;
     CustomTrackView *m_trackview;
+    QList <QString> m_invalidProducers;
     double m_scale;
     int m_projectTracks;
     QString m_editMode;
     CustomTrackScene *m_scene;
 
     KdenliveDoc *m_doc;
-    QVBoxLayout *m_tracksLayout;
     QVBoxLayout *m_headersLayout;
-    QScrollArea *m_scrollArea;
-    QFrame *m_scrollBox;
-    QVBoxLayout *m_tracksAreaLayout;
     QString m_documentErrors;
     void parseDocument(QDomDocument doc);
-    int slotAddProjectTrack(int ix, QDomElement xml, bool videotrack);
+    int slotAddProjectTrack(int ix, QDomElement xml, bool locked);
+    DocClipBase *getMissingProducer(const QString id) const;
 
 private slots:
     void setCursorPos(int pos);
     void moveCursorPos(int pos);
     void slotTransitionItemSelected(Transition*, bool update);
     void slotRebuildTrackHeaders();
-
+    void slotChangeTrackLock(int ix, bool lock);
 
 signals:
     void mousePosition(int);
@@ -100,6 +96,7 @@ signals:
     void zoneMoved(int, int);
     void insertTrack(int);
     void deleteTrack(int);
+    void changeTrack(int);
 };
 
 #endif