From: Jean-Baptiste Mardelle Date: Tue, 16 Jun 2009 06:02:50 +0000 (+0000) Subject: Fix compile warning X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=fa51ab38fb151a34504ae0a145393db35cd509ef;p=kdenlive Fix compile warning svn path=/trunk/kdenlive/; revision=3546 --- diff --git a/src/monitor.cpp b/src/monitor.cpp index 80d48df0..cafe772b 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -43,18 +43,18 @@ 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) diff --git a/src/monitor.h b/src/monitor.h index bd0c0dda..fbe9ee83 100644 --- a/src/monitor.h +++ b/src/monitor.h @@ -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: