fix coverity 709295

[kdenlive] / src / beziercurve / beziersplinewidget.cpp

diff --git a/src/beziercurve/beziersplinewidget.cpp b/src/beziercurve/beziersplinewidget.cpp
index 1e286441ecd5309709a51d2a99c5796f1fdf890b..00c7edfe04dac057eddcb21da98e214e40223eea 100644 (file)
--- a/src/beziercurve/beziersplinewidget.cpp
+++ b/src/beziercurve/beziersplinewidget.cpp
@@ -24,7 +24,7 @@
 #include <QVBoxLayout>
 
 #include <KIcon>
-#include <KLocale>
+#include <KLocalizedString>
 
 
 BezierSplineWidget::BezierSplineWidget(const QString& spline, QWidget* parent) :
@@ -38,32 +38,26 @@ BezierSplineWidget::BezierSplineWidget(const QString& spline, QWidget* parent) :
     m_ui.setupUi(widget);
     layout->addWidget(widget);
 
-    m_ui.buttonLinkHandles->setIcon(KIcon("insert-link"));
-    m_ui.buttonZoomIn->setIcon(KIcon("zoom-in"));
-    m_ui.buttonZoomOut->setIcon(KIcon("zoom-out"));
-    m_ui.buttonGridChange->setIcon(KIcon("view-grid"));
+    m_ui.buttonLinkHandles->setIcon(KIcon(QLatin1String("insert-link")));
+    m_ui.buttonZoomIn->setIcon(KIcon(QLatin1String("zoom-in")));
+    m_ui.buttonZoomOut->setIcon(KIcon(QLatin1String("zoom-out")));
+    m_ui.buttonGridChange->setIcon(KIcon(QLatin1String("view-grid")));
     m_ui.buttonShowPixmap->setIcon(QIcon(QPixmap::fromImage(ColorTools::rgbCurvePlane(QSize(16, 16), ColorTools::COL_Luma, 0.8))));
-    m_ui.buttonResetSpline->setIcon(KIcon("view-refresh"));
-    m_ui.buttonShowAllHandles->setIcon(KIcon("draw-bezier-curves"));
+    m_ui.buttonResetSpline->setIcon(KIcon(QLatin1String("view-refresh")));
+    m_ui.buttonShowAllHandles->setIcon(KIcon(QLatin1String("draw-bezier-curves")));
     m_ui.widgetPoint->setEnabled(false);
 
-    m_pX = new DragValue(i18n("In"), 0, 3, -1, QString(), false, this);
-    m_pX->setRange(0, 1);
+    m_pX = new DragValue(i18n("In"), 0, 3, 0, 1, -1, QString(), false, this);
     m_pX->setStep(0.001);
-    m_pY = new DragValue(i18n("Out"), 0, 3, -1, QString(), false, this);
-    m_pY->setRange(0, 1);
+    m_pY = new DragValue(i18n("Out"), 0, 3, 0, 1, -1, QString(), false, this);
     m_pY->setStep(0.001);
-    m_h1X = new DragValue(i18n("X"), 0, 3, -1, QString(), false, this);
-    m_h1X->setRange(-2, 2);
+    m_h1X = new DragValue(i18n("X"), 0, 3, -2, 2, -1, QString(), false, this);
     m_h1X->setStep(0.001);
-    m_h1Y = new DragValue(i18n("Y"), 0, 3, -1, QString(), false, this);
-    m_h1Y->setRange(-2, 2);
+    m_h1Y = new DragValue(i18n("Y"), 0, 3, -2, 2, -1, QString(), false, this);
     m_h1Y->setStep(0.001);
-    m_h2X = new DragValue(i18n("X"), 0, 3, -1, QString(), false, this);
-    m_h2X->setRange(-2, 2);
+    m_h2X = new DragValue(i18n("X"), 0, 3, -2, 2, -1, QString(), false, this);
     m_h2X->setStep(0.001);
-    m_h2Y = new DragValue(i18n("Y"), 0, 3, -1, QString(), false, this);
-    m_h2Y->setRange(-2, 2);
+    m_h2Y = new DragValue(i18n("Y"), 0, 3, -2, 2, -1, QString(), false, this);
     m_h2Y->setStep(0.001);
 
     m_ui.layoutP->addWidget(m_pX);
@@ -80,14 +74,14 @@ BezierSplineWidget::BezierSplineWidget(const QString& spline, QWidget* parent) :
     m_edit.setSpline(s);
 
     connect(&m_edit, SIGNAL(modified()), this, SIGNAL(modified()));
-    connect(&m_edit, SIGNAL(currentPoint(const BPoint&)), this, SLOT(slotUpdatePointEntries(const BPoint&)));
+    connect(&m_edit, SIGNAL(currentPoint(BPoint)), this, SLOT(slotUpdatePointEntries(BPoint)));
 
-    connect(m_pX, SIGNAL(valueChanged(double, bool)), this, SLOT(slotUpdatePointP()));
-    connect(m_pY, SIGNAL(valueChanged(double,bool)), this, SLOT(slotUpdatePointP()));
-    connect(m_h1X, SIGNAL(valueChanged(double,bool)), this, SLOT(slotUpdatePointH1()));
-    connect(m_h1Y, SIGNAL(valueChanged(double,bool)), this, SLOT(slotUpdatePointH1()));
-    connect(m_h2X, SIGNAL(valueChanged(double,bool)), this, SLOT(slotUpdatePointH2()));
-    connect(m_h2Y, SIGNAL(valueChanged(double,bool)), this, SLOT(slotUpdatePointH2()));
+    connect(m_pX, SIGNAL(valueChanged(double,bool)), this, SLOT(slotUpdatePointP(double,bool)));
+    connect(m_pY, SIGNAL(valueChanged(double,bool)), this, SLOT(slotUpdatePointP(double,bool)));
+    connect(m_h1X, SIGNAL(valueChanged(double,bool)), this, SLOT(slotUpdatePointH1(double,bool)));
+    connect(m_h1Y, SIGNAL(valueChanged(double,bool)), this, SLOT(slotUpdatePointH1(double,bool)));
+    connect(m_h2X, SIGNAL(valueChanged(double,bool)), this, SLOT(slotUpdatePointH2(double,bool)));
+    connect(m_h2Y, SIGNAL(valueChanged(double,bool)), this, SLOT(slotUpdatePointH2(double,bool)));
 
     connect(m_ui.buttonLinkHandles, SIGNAL(toggled(bool)), this, SLOT(slotSetHandlesLinked(bool)));
     connect(m_ui.buttonZoomIn, SIGNAL(clicked()), &m_edit, SLOT(slotZoomIn()));
@@ -103,7 +97,7 @@ BezierSplineWidget::BezierSplineWidget(const QString& spline, QWidget* parent) :
     m_ui.buttonShowAllHandles->setChecked(KdenliveSettings::bezier_showallhandles());
 }
 
-QString BezierSplineWidget::spline()
+QString BezierSplineWidget::spline() const
 {
     return m_edit.spline().toString();
 }
@@ -125,14 +119,16 @@ void BezierSplineWidget::slotGridChange()
 
 void BezierSplineWidget::slotShowPixmap(bool show)
 {
-    m_showPixmap = show;
-    KdenliveSettings::setBezier_showpixmap(show);
-    if (show && (int)m_mode < 6)
-        m_edit.setPixmap(QPixmap::fromImage(ColorTools::rgbCurvePlane(m_edit.size(), (ColorTools::ColorsRGB)((int)m_mode), 1, palette().background().color().rgb())));
-//     else if (show && m_mode == ModeHue)
-//         m_edit.setPixmap(QPixmap::fromImage(ColorTools::hsvHueShiftPlane(m_edit.size(), 200, 200, 0, 360)));
-    else
-        m_edit.setPixmap(QPixmap());
+    if (m_showPixmap != show) {
+        m_showPixmap = show;
+        KdenliveSettings::setBezier_showpixmap(show);
+        if (show && (int)m_mode < 6)
+            m_edit.setPixmap(QPixmap::fromImage(ColorTools::rgbCurvePlane(m_edit.size(), static_cast<ColorTools::ColorsRGB>(m_mode), 1, palette().background().color().rgb())));
+        else if (show && m_mode == ModeHue)
+            m_edit.setPixmap(QPixmap::fromImage(ColorTools::hsvCurvePlane(m_edit.size(), QColor::fromHsv(200, 200, 200), ColorTools::COM_H, ColorTools::COM_H)));
+        else
+            m_edit.setPixmap(QPixmap());
+    }
 }
 
 void BezierSplineWidget::slotUpdatePointEntries(const BPoint &p)
@@ -165,31 +161,37 @@ void BezierSplineWidget::slotUpdatePointEntries(const BPoint &p)
     blockSignals(false);
 }
 
-void BezierSplineWidget::slotUpdatePointP()
+void BezierSplineWidget::slotUpdatePointP(double value, bool final)
 {
+    Q_UNUSED(value)
+
     BPoint p = m_edit.getCurrentPoint();
 
     p.setP(QPointF(m_pX->value(), m_pY->value()));
 
-    m_edit.updateCurrentPoint(p);
+    m_edit.updateCurrentPoint(p, final);
 }
 
-void BezierSplineWidget::slotUpdatePointH1()
+void BezierSplineWidget::slotUpdatePointH1(double value, bool final)
 {
+    Q_UNUSED(value)
+
     BPoint p = m_edit.getCurrentPoint();
 
     p.setH1(QPointF(m_h1X->value(), m_h1Y->value()));
 
-    m_edit.updateCurrentPoint(p);
+    m_edit.updateCurrentPoint(p, final);
 }
 
-void BezierSplineWidget::slotUpdatePointH2()
+void BezierSplineWidget::slotUpdatePointH2(double value, bool final)
 {
+    Q_UNUSED(value)
+
     BPoint p = m_edit.getCurrentPoint();
 
     p.setH2(QPointF(m_h2X->value(), m_h2Y->value()));
 
-    m_edit.updateCurrentPoint(p);
+    m_edit.updateCurrentPoint(p, final);
 }
 
 void BezierSplineWidget::slotSetHandlesLinked(bool linked)