From: Jean-Baptiste M. <jb...@kd...> - 2013-06-11 17:42:03
|
Git commit 0da7c8bd947f919f7e07588724f8a432adf54738 by Jean-Baptiste Mardelle. Committed on 11/06/2013 at 19:40. Pushed by mardelle into branch 'master'. Fix compile warnings M +1 -1 src/core/monitor/glslwidget.cpp M +1 -1 src/core/timelineview/timelinewidget.h http://commits.kde.org/kdenlive/0da7c8bd947f919f7e07588724f8a432adf54738 diff --git a/src/core/monitor/glslwidget.cpp b/src/core/monitor/glslwidget.cpp index ad659ca..f728039 100644 --- a/src/core/monitor/glslwidget.cpp +++ b/src/core/monitor/glslwidget.cpp @@ -48,7 +48,7 @@ GLSLWidget::GLSLWidget(Mlt::Profile *profile, QWidget *parent) , m_renderContext(0) { m_display_ratio = 4.0/3.0; - m_texture[0] = m_texture[1] = m_texture[2] = 0; + m_texture[0] = 0; setAttribute(Qt::WA_PaintOnScreen); setAttribute(Qt::WA_OpaquePaintEvent); setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); diff --git a/src/core/timelineview/timelinewidget.h b/src/core/timelineview/timelinewidget.h index c622083..b494cf7 100644 --- a/src/core/timelineview/timelinewidget.h +++ b/src/core/timelineview/timelinewidget.h @@ -68,10 +68,10 @@ private: ToolManager *m_toolManager; KToolBar *m_toolbar; QFrame *m_toolContainer; + Timeline *m_clipTimeline; MonitorView *m_monitor; QStackedWidget *m_toolPanel; MarkersWidget *m_markersWidget; - Timeline *m_clipTimeline; KComboBox *m_toolPanelSelector; }; |