From 4fba89810f9bc0bbf7f3e1c286a1d868d88918f3 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Wed, 15 May 2013 09:14:21 +0200 Subject: [PATCH] Minor optimization. Use const'ref --- src/beziercurve/beziersplinewidget.cpp | 18 ++++++++++-------- src/beziercurve/beziersplinewidget.h | 1 - src/effectstack/collapsibleeffect.cpp | 14 ++++++-------- src/effectstack/collapsibleeffect.h | 6 +++--- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/beziercurve/beziersplinewidget.cpp b/src/beziercurve/beziersplinewidget.cpp index e4d5a322..f61e65f9 100644 --- a/src/beziercurve/beziersplinewidget.cpp +++ b/src/beziercurve/beziersplinewidget.cpp @@ -119,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::hsvCurvePlane(m_edit.size(), QColor::fromHsv(200, 200, 200), ColorTools::COM_H, ColorTools::COM_H))); - 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(), (ColorTools::ColorsRGB)((int)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) diff --git a/src/beziercurve/beziersplinewidget.h b/src/beziercurve/beziersplinewidget.h index 6a224c3e..c9e48edd 100644 --- a/src/beziercurve/beziersplinewidget.h +++ b/src/beziercurve/beziersplinewidget.h @@ -23,7 +23,6 @@ #include "beziersplineeditor.h" #include "ui_bezierspline_ui.h" -#include #include class DragValue; diff --git a/src/effectstack/collapsibleeffect.cpp b/src/effectstack/collapsibleeffect.cpp index 093ff48a..194c25cd 100644 --- a/src/effectstack/collapsibleeffect.cpp +++ b/src/effectstack/collapsibleeffect.cpp @@ -405,18 +405,16 @@ int CollapsibleEffect::effectIndex() const return m_effect.attribute("kdenlive_ix").toInt(); } -void CollapsibleEffect::updateWidget(ItemInfo info, QDomElement effect, EffectMetaInfo *metaInfo) +void CollapsibleEffect::updateWidget(const ItemInfo &info, const QDomElement &effect, EffectMetaInfo *metaInfo) { - if (m_paramWidget) { - // cleanup - delete m_paramWidget; - m_paramWidget = NULL; - } + // cleanup + delete m_paramWidget; + m_paramWidget = NULL; m_effect = effect; setupWidget(info, metaInfo); } -void CollapsibleEffect::setupWidget(ItemInfo info, EffectMetaInfo *metaInfo) +void CollapsibleEffect::setupWidget(const ItemInfo &info, EffectMetaInfo *metaInfo) { if (m_effect.isNull()) { // kDebug() << "// EMPTY EFFECT STACK"; @@ -602,7 +600,7 @@ void CollapsibleEffect::setRange(int inPoint , int outPoint) m_paramWidget->setRange(inPoint, outPoint); } -void CollapsibleEffect::setKeyframes(const QString data, int maximum) +void CollapsibleEffect::setKeyframes(const QString &data, int maximum) { m_paramWidget->setKeyframes(data, maximum); } diff --git a/src/effectstack/collapsibleeffect.h b/src/effectstack/collapsibleeffect.h index c73cf67b..98515230 100644 --- a/src/effectstack/collapsibleeffect.h +++ b/src/effectstack/collapsibleeffect.h @@ -47,13 +47,13 @@ public: ~CollapsibleEffect(); QLabel *title; - void setupWidget(ItemInfo info, EffectMetaInfo *metaInfo); + void setupWidget(const ItemInfo &info, EffectMetaInfo *metaInfo); void updateTimecodeFormat(); void setActive(bool activate); /** @brief Install event filter so that scrolling with mouse wheel does not change parameter value. */ virtual bool eventFilter( QObject * o, QEvent * e ); /** @brief Update effect GUI to reflect parameted changes. */ - void updateWidget(ItemInfo info, QDomElement effect, EffectMetaInfo *metaInfo); + void updateWidget(const ItemInfo &info, const QDomElement &effect, EffectMetaInfo *metaInfo); QDomElement effect() const; int groupIndex() const; bool isGroup() const; @@ -75,7 +75,7 @@ public: /** @brief Set clip in / out points. */ void setRange(int inPoint , int outPoint); /** @brief Import keyframes from a clip's data. */ - void setKeyframes(const QString data, int maximum); + void setKeyframes(const QString &data, int maximum); public slots: void slotSyncEffectsPos(int pos); -- 2.39.2