Const'ref

diff --git a/src/scopes/colorscopes/abstractgfxscopewidget.cpp b/src/scopes/colorscopes/abstractgfxscopewidget.cpp
index 82dca82a509d3ba9fefc932c16bacce6a8faec7d..9fda26f0bb4f25e4a4ffaa68b97585bd296f31fa 100644 (file)
--- a/src/scopes/colorscopes/abstractgfxscopewidget.cpp
+++ b/src/scopes/colorscopes/abstractgfxscopewidget.cpp
@@ -51,7 +51,7 @@ void AbstractGfxScopeWidget::mouseReleaseEvent(QMouseEvent *event)
 ///// Slots /////
 
 
-void AbstractGfxScopeWidget::slotRenderZoneUpdated(const QImage frame)
+void AbstractGfxScopeWidget::slotRenderZoneUpdated(const QImage &frame)
 {
     QMutexLocker lock(&m_mutex);
     m_scopeImage = frame.rgbSwapped();

diff --git a/src/scopes/colorscopes/abstractgfxscopewidget.h b/src/scopes/colorscopes/abstractgfxscopewidget.h
index b6f2816f0186bad33cde785cbd6e057906fc432b..d7bd739e73267b765ade64f312f35bba75c2e386 100644 (file)
--- a/src/scopes/colorscopes/abstractgfxscopewidget.h
+++ b/src/scopes/colorscopes/abstractgfxscopewidget.h
@@ -36,7 +36,7 @@ protected:
     /** @brief Scope renderer. Must emit signalScopeRenderingFinished()
         when calculation has finished, to allow multi-threading.
         accelerationFactor hints how much faster than usual the calculation should be accomplished, if possible. */
-    virtual QImage renderGfxScope(uint accelerationFactor, const QImage) = 0;
+    virtual QImage renderGfxScope(uint accelerationFactor, const QImage &) = 0;
 
     virtual QImage renderScope(uint accelerationFactor);
 
@@ -50,13 +50,13 @@ public slots:
     /** @brief Must be called when the active monitor has shown a new frame.
       This slot must be connected in the implementing class, it is *not*
       done in this abstract class. */
-    void slotRenderZoneUpdated(const QImage);
+    void slotRenderZoneUpdated(const QImage &);
 
 protected slots:
     virtual void slotAutoRefreshToggled(bool autoRefresh);
 
 signals:
-    void signalFrameRequest(const QString widgetName);
+    void signalFrameRequest(const QString &widgetName);
 
 };
 

diff --git a/src/scopes/colorscopes/histogram.cpp b/src/scopes/colorscopes/histogram.cpp
index 3ee12be0b76dda7e59acce54750f9e876ff21e9d..d50134ff944575fd58bc31ddb651d22d13cd7c2d 100644 (file)
--- a/src/scopes/colorscopes/histogram.cpp
+++ b/src/scopes/colorscopes/histogram.cpp
@@ -109,7 +109,7 @@ QImage Histogram::renderHUD(uint)
     emit signalHUDRenderingFinished(0, 1);
     return QImage();
 }
-QImage Histogram::renderGfxScope(uint accelFactor, const QImage qimage)
+QImage Histogram::renderGfxScope(uint accelFactor, const QImage &qimage)
 {
     QTime start = QTime::currentTime();
     start.start();

diff --git a/src/scopes/colorscopes/histogram.h b/src/scopes/colorscopes/histogram.h
index f2b4dd3af874828749c96e26490b2df2871f0bbd..9917bcec8bfe413f20857bdef3c1f0aa5164b031 100644 (file)
--- a/src/scopes/colorscopes/histogram.h
+++ b/src/scopes/colorscopes/histogram.h
@@ -43,7 +43,7 @@ private:
     bool isScopeDependingOnInput() const;
     bool isBackgroundDependingOnInput() const;
     QImage renderHUD(uint accelerationFactor);
-    QImage renderGfxScope(uint accelerationFactor, const QImage);
+    QImage renderGfxScope(uint accelerationFactor, const QImage &);
     QImage renderBackground(uint accelerationFactor);
     Ui::Histogram_UI *ui;
 

diff --git a/src/scopes/colorscopes/rgbparade.cpp b/src/scopes/colorscopes/rgbparade.cpp
index f2583262127e9060718b01f084eb884eba3f1e56..71d540a95132d7e56a0e2a3348e42c85d5cebb23 100644 (file)
--- a/src/scopes/colorscopes/rgbparade.cpp
+++ b/src/scopes/colorscopes/rgbparade.cpp
@@ -123,7 +123,7 @@ QImage RGBParade::renderHUD(uint)
     return hud;
 }
 
-QImage RGBParade::renderGfxScope(uint accelerationFactor, const QImage qimage)
+QImage RGBParade::renderGfxScope(uint accelerationFactor, const QImage &qimage)
 {
     QTime start = QTime::currentTime();
     start.start();
@@ -135,8 +135,23 @@ QImage RGBParade::renderGfxScope(uint accelerationFactor, const QImage qimage)
     return parade;
 }
 
-QImage RGBParade::renderBackground(uint) { return QImage(); }
+QImage RGBParade::renderBackground(uint)
+{
+    return QImage();
+}
+
+bool RGBParade::isHUDDependingOnInput() const
+{
+    return false;
+}
+
+bool RGBParade::isScopeDependingOnInput() const
+{
+    return true;
+}
+
+bool RGBParade::isBackgroundDependingOnInput() const
+{
+    return false;
+}
 
-bool RGBParade::isHUDDependingOnInput() const { return false; }
-bool RGBParade::isScopeDependingOnInput() const { return true; }
-bool RGBParade::isBackgroundDependingOnInput() const { return false; }

diff --git a/src/scopes/colorscopes/rgbparade.h b/src/scopes/colorscopes/rgbparade.h
index 6fadd353f67edfbc3c81430aee1078b539dabb8e..1cb98e25b573e54cbf817c9fac02a815f3c9e57e 100644 (file)
--- a/src/scopes/colorscopes/rgbparade.h
+++ b/src/scopes/colorscopes/rgbparade.h
@@ -47,7 +47,7 @@ private:
     bool isBackgroundDependingOnInput() const;
 
     QImage renderHUD(uint accelerationFactor);
-    QImage renderGfxScope(uint accelerationFactor, const QImage);
+    QImage renderGfxScope(uint accelerationFactor, const QImage &);
     QImage renderBackground(uint accelerationFactor);
 };
 

diff --git a/src/scopes/colorscopes/vectorscope.cpp b/src/scopes/colorscopes/vectorscope.cpp
index 62370dbef67ba71c36dfc4d3257ba8b95d3657d1..569e45ccb31edfa37edf49b53a47757ecd39805b 100644 (file)
--- a/src/scopes/colorscopes/vectorscope.cpp
+++ b/src/scopes/colorscopes/vectorscope.cpp
@@ -138,7 +138,10 @@ Vectorscope::~Vectorscope()
     delete ui;
 }
 
-QString Vectorscope::widgetName() const { return QString("Vectorscope"); }
+QString Vectorscope::widgetName() const
+{
+    return QLatin1String("Vectorscope");
+}
 
 void Vectorscope::readConfig()
 {
@@ -259,7 +262,7 @@ QImage Vectorscope::renderHUD(uint)
     return hud;
 }
 
-QImage Vectorscope::renderGfxScope(uint accelerationFactor, const QImage qimage)
+QImage Vectorscope::renderGfxScope(uint accelerationFactor, const QImage &qimage)
 {
     QTime start = QTime::currentTime();
     QImage scope;

diff --git a/src/scopes/colorscopes/vectorscope.h b/src/scopes/colorscopes/vectorscope.h
index 51166633a77a62023b990b56dbcd4567241fcf13..9bf0746beb3c270f482f11c930a9fdfaba85af72 100644 (file)
--- a/src/scopes/colorscopes/vectorscope.h
+++ b/src/scopes/colorscopes/vectorscope.h
@@ -41,7 +41,7 @@ protected:
     ///// Implemented methods /////
     QRect scopeRect();
     QImage renderHUD(uint accelerationFactor);
-    QImage renderGfxScope(uint accelerationFactor, const QImage);
+    QImage renderGfxScope(uint accelerationFactor, const QImage &);
     QImage renderBackground(uint accelerationFactor);
     bool isHUDDependingOnInput() const;
     bool isScopeDependingOnInput() const;

diff --git a/src/scopes/colorscopes/waveform.cpp b/src/scopes/colorscopes/waveform.cpp
index 8fd67e7e662efe749074fe27f4460d7b20b8d61f..f639704ecf525e1e255adb444f323dbc3010f8eb 100644 (file)
--- a/src/scopes/colorscopes/waveform.cpp
+++ b/src/scopes/colorscopes/waveform.cpp
@@ -170,7 +170,7 @@ QImage Waveform::renderHUD(uint)
     return hud;
 }
 
-QImage Waveform::renderGfxScope(uint accelFactor, const QImage qimage)
+QImage Waveform::renderGfxScope(uint accelFactor, const QImage &qimage)
 {
     QTime start = QTime::currentTime();
     start.start();

diff --git a/src/scopes/colorscopes/waveform.h b/src/scopes/colorscopes/waveform.h
index 05950dbd60c51838c23dee2881975abb0994ecd9..8b609f60c20aa9a31636839d07c9923a8e157457 100644 (file)
--- a/src/scopes/colorscopes/waveform.h
+++ b/src/scopes/colorscopes/waveform.h
@@ -52,7 +52,7 @@ private:
     /// Implemented methods ///
     QRect scopeRect();
     QImage renderHUD(uint);
-    QImage renderGfxScope(uint, const QImage);
+    QImage renderGfxScope(uint, const QImage &);
     QImage renderBackground(uint);
     bool isHUDDependingOnInput() const;
     bool isScopeDependingOnInput() const;

diff --git a/src/simplekeyframes/simpletimelinewidget.h b/src/simplekeyframes/simpletimelinewidget.h
index 4311145367293c7c924941e775f7100a868fbbf0..37198b81837d9188d87a552fc6536df61ddd9355 100644 (file)
--- a/src/simplekeyframes/simpletimelinewidget.h
+++ b/src/simplekeyframes/simpletimelinewidget.h
@@ -40,12 +40,12 @@ public slots:
     void slotGoToPrev();
 
 protected:
-    virtual void paintEvent(QPaintEvent *event);
-    virtual void mousePressEvent(QMouseEvent *event);
-    virtual void mouseReleaseEvent(QMouseEvent *event);
-    virtual void mouseMoveEvent(QMouseEvent *event);
-    virtual void mouseDoubleClickEvent(QMouseEvent *event);
-    virtual void wheelEvent(QWheelEvent *event);
+    void paintEvent(QPaintEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseReleaseEvent(QMouseEvent *event);
+    void mouseMoveEvent(QMouseEvent *event);
+    void mouseDoubleClickEvent(QMouseEvent *event);
+    void wheelEvent(QWheelEvent *event);
 
 private:
     int m_duration;

diff --git a/src/stopmotion/stopmotion.cpp b/src/stopmotion/stopmotion.cpp
index 36d60147bacf27c0d5e8caebccba8fbf57bd79ad..6235ac91485874d904866f5c2f2298f3028645e0 100644 (file)
--- a/src/stopmotion/stopmotion.cpp
+++ b/src/stopmotion/stopmotion.cpp
@@ -58,8 +58,10 @@ void MyLabel::setImage(const QImage& img)
 //virtual
 void MyLabel::wheelEvent(QWheelEvent* event)
 {
-    if (event->delta() > 0) emit seek(true);
-    else emit seek(false);
+    if (event->delta() > 0)
+        emit seek(true);
+    else
+        emit seek(false);
 }
 
 //virtual
@@ -141,14 +143,14 @@ void StopmotionMonitor::slotMouseSeek(int /*eventDelta*/, bool /*fast*/)
 
 StopmotionWidget::StopmotionWidget(MonitorManager *manager, const KUrl &projectFolder, const QList<QAction *> &actions, QWidget* parent) :
     QDialog(parent)
-    , Ui::Stopmotion_UI()
-    , m_projectFolder(projectFolder)
-    , m_captureDevice(NULL)
-    , m_sequenceFrame(0)
-    , m_animatedIndex(-1)
-    , m_animate(false)
-    , m_manager(manager)
-    , m_monitor(new StopmotionMonitor(manager, this))
+  , Ui::Stopmotion_UI()
+  , m_projectFolder(projectFolder)
+  , m_captureDevice(NULL)
+  , m_sequenceFrame(0)
+  , m_animatedIndex(-1)
+  , m_animate(false)
+  , m_manager(manager)
+  , m_monitor(new StopmotionMonitor(manager, this))
 {
     //setAttribute(Qt::WA_DeleteOnClose);
     //HACK: the monitor widget is hidden, it is just used to control the capturedevice from monitormanager
@@ -707,8 +709,9 @@ void StopmotionWidget::slotCreateThumbs(const QImage &img, int ix)
 
 QString StopmotionWidget::getPathForFrame(int ix, QString seqName)
 {
-    if (seqName.isEmpty()) seqName = m_sequenceName;
-    return m_projectFolder.path(KUrl::AddTrailingSlash) + seqName + '_' + QString::number(ix).rightJustified(4, '0', false) + ".png";
+    if (seqName.isEmpty())
+        seqName = m_sequenceName;
+    return m_projectFolder.path(KUrl::AddTrailingSlash) + seqName + QLatin1Char('_') + QString::number(ix).rightJustified(4, '0', false) + QLatin1String(".png");
 }
 
 void StopmotionWidget::slotShowFrame(const QString& path)
@@ -835,7 +838,8 @@ void StopmotionWidget::selectFrame(int ix)
 {
     frame_list->blockSignals(true);
     QListWidgetItem* item = getFrameFromIndex(ix);
-    if (!item) return;
+    if (!item)
+        return;
     frame_list->setCurrentItem(item);
     frame_list->blockSignals(false);
 }
@@ -852,7 +856,9 @@ void StopmotionWidget::slotRemoveFrame()
 {
     if (frame_list->currentItem() == NULL) return;
     QString path = frame_list->currentItem()->toolTip();
-    if (KMessageBox::questionYesNo(this, i18n("Delete frame %1 from disk?", path), i18n("Delete Frame")) != KMessageBox::Yes) return;
+    if (KMessageBox::questionYesNo(this, i18n("Delete frame %1 from disk?", path), i18n("Delete Frame")) != KMessageBox::Yes)
+        return;
+
     QFile f(path);
     if (f.remove()) {
         QListWidgetItem* item = frame_list->takeItem(frame_list->currentRow());
@@ -875,7 +881,8 @@ void StopmotionWidget::slotSwitchAnalyse(bool isOn)
 void StopmotionWidget::slotSwitchMirror(bool isOn)
 {
     //KdenliveSettings::setAnalyse_stopmotion(isOn);
-    if (m_captureDevice) m_captureDevice->mirror(isOn);
+    if (m_captureDevice)
+        m_captureDevice->mirror(isOn);
 }
 
 

diff --git a/src/stopmotion/stopmotion.h b/src/stopmotion/stopmotion.h
index 3f2b79e2ee674b344981bbc6e317ea928123647e..338b6fadcd2b52ecdf48004861d5a9cf0bec3202 100644 (file)
--- a/src/stopmotion/stopmotion.h
+++ b/src/stopmotion/stopmotion.h
@@ -36,7 +36,7 @@ class MyLabel : public QLabel
 {
     Q_OBJECT
 public:
-    MyLabel(QWidget* parent = 0);
+    explicit MyLabel(QWidget* parent = 0);
     void setImage(const QImage &img);
 
 protected: