]> git.sesse.net Git - kdenlive/commitdiff
Fix compile warning
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Tue, 16 Jun 2009 06:02:50 +0000 (06:02 +0000)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Tue, 16 Jun 2009 06:02:50 +0000 (06:02 +0000)
svn path=/trunk/kdenlive/; revision=3546

src/monitor.cpp
src/monitor.h

index 80d48df03ba82e32ff22f0173e96a24f681381c6..cafe772bba346c8d1f3b17dacf677e9d8b0fccca 100644 (file)
 Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) :
         QWidget(parent),
         render(NULL),
-        m_monitorManager(manager),
         m_name(name),
-        m_isActive(false),
+        m_monitorManager(manager),
         m_currentClip(NULL),
+        m_ruler(new SmallRuler()),
+        m_overlay(NULL),
+        m_isActive(false),
+        m_scale(1),
         m_length(0),
         m_position(-1),
-        m_dragStarted(false),
-        m_overlay(NULL)
+        m_dragStarted(false)
 {
     m_ui.setupUi(this);
-    m_scale = 1;
-    m_ruler = new SmallRuler();
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_ruler);
@@ -753,7 +753,8 @@ MonitorRefresh::MonitorRefresh(QWidget* parent) : \
         m_renderer(NULL)
 {
     setAttribute(Qt::WA_PaintOnScreen);
-    setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground);
+    setAttribute(Qt::WA_OpaquePaintEvent);
+    //setAttribute(Qt::WA_NoSystemBackground);
 }
 
 void MonitorRefresh::setRenderer(Render* render)
index bd0c0dda26141bdf84502a655dfa8a58aa647a14..fbe9ee8358ba4c05fe70563f5a488bd5553b0deb 100644 (file)
@@ -93,25 +93,25 @@ protected:
 
 private:
     Ui::Monitor_UI m_ui;
-    MonitorManager *m_monitorManager;
-    MonitorRefresh *m_monitorRefresh;
     QString m_name;
+    MonitorManager *m_monitorManager;
+    DocClipBase *m_currentClip;
+    SmallRuler *m_ruler;
+    Overlay *m_overlay;
+    bool m_isActive;
     double m_scale;
     int m_length;
     int m_position;
-    SmallRuler *m_ruler;
+    bool m_dragStarted;
+    MonitorRefresh *m_monitorRefresh;
     KIcon m_playIcon;
     KIcon m_pauseIcon;
-    bool m_isActive;
     KRestrictedLine *m_timePos;
     QAction *m_playAction;
     QMenu *m_contextMenu;
     QMenu *m_configMenu;
     QMenu *m_playMenu;
-    DocClipBase *m_currentClip;
     QPoint m_DragStartPosition;
-    bool m_dragStarted;
-    Overlay *m_overlay;
     GenTime getSnapForPos(bool previous);
 
 private slots: