Merging of scopes manager by Granjow (final merge)

[kdenlive] / src / scopes / abstractscopewidget.cpp

diff --git a/src/scopes/abstractscopewidget.cpp b/src/scopes/abstractscopewidget.cpp
index 0622bd97d72c0f325a3fc05b1ad50ead09dc6076..6d4b1c8ee7aea40b8492c33a8992d95421aa1f3f 100644 (file)
--- a/src/scopes/abstractscopewidget.cpp
+++ b/src/scopes/abstractscopewidget.cpp
@@ -8,11 +8,12 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#include "qtconcurrentrun.h"
+
 #include "abstractscopewidget.h"
 #include "renderer.h"
 #include "monitor.h"
 
-#include <QtConcurrentRun>
 #include <QFuture>
 #include <QColor>
 #include <QMenu>
@@ -62,7 +63,8 @@ AbstractScopeWidget::AbstractScopeWidget(bool trackMouse, QWidget *parent) :
         initialDimensionUpdateDone(false),
         m_requestForcedUpdate(false),
         m_rescaleMinDist(4),
-        m_rescaleVerticalThreshold(2.0f)
+        m_rescaleVerticalThreshold(2.0f),
+        m_rescaleActive(false)
 
 {
     m_scopePalette = QPalette();
@@ -427,7 +429,7 @@ void AbstractScopeWidget::slotHUDRenderingFinished(uint mseconds, uint oldFactor
         qDebug() << "Trying to start a new HUD thread for " << m_widgetName
                 << ". New frames/updates: " << m_newHUDFrames << "/" << m_newHUDUpdates;
 #endif
-        prodHUDThread();;
+        prodHUDThread();
     }
 }
 
@@ -531,7 +533,7 @@ void AbstractScopeWidget::slotResetRealtimeFactor(bool realtimeChecked)
     }
 }
 
-bool AbstractScopeWidget::autoRefreshEnabled()
+bool AbstractScopeWidget::autoRefreshEnabled() const
 {
     return m_aAutoRefresh->isChecked();
 }