From aa37ed1efa7f18af7b851c0bb3aaadb9ff8ebe3e Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Thu, 16 May 2013 07:52:27 +0200 Subject: [PATCH] const'ify/ref + minor optimization --- src/colorpickerwidget.h | 2 +- src/customruler.cpp | 14 ++++++++------ src/customruler.h | 4 ++-- src/customtrackview.cpp | 4 ++-- src/customtrackview.h | 4 ++-- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/colorpickerwidget.h b/src/colorpickerwidget.h index 2401a279..def14f1f 100644 --- a/src/colorpickerwidget.h +++ b/src/colorpickerwidget.h @@ -95,7 +95,7 @@ private slots: void slotGetAverageColor(); signals: - void colorPicked(QColor); + void colorPicked(const QColor&); void displayMessage(const QString&, int); /** @brief When user wants to pick a color, it's better to disable filter so we get proper color values. */ void disableCurrentFilter(bool); diff --git a/src/customruler.cpp b/src/customruler.cpp index b7126ae0..08370c21 100644 --- a/src/customruler.cpp +++ b/src/customruler.cpp @@ -99,7 +99,7 @@ void CustomRuler::updatePalette() m_zoneColor.setAlpha(180); } -void CustomRuler::updateProjectFps(Timecode t) +void CustomRuler::updateProjectFps(const Timecode &t) { m_timecode = t; mediumMarkDistance = FRAME_SIZE * m_timecode.fps(); @@ -133,7 +133,7 @@ void CustomRuler::slotGoToGuide(QAction *act) m_view->initCursorPos(act->data().toInt()); } -void CustomRuler::setZone(QPoint p) +void CustomRuler::setZone(const QPoint &p) { m_zoneStart = p.x(); m_zoneEnd = p.y(); @@ -261,8 +261,8 @@ void CustomRuler::leaveEvent(QEvent * event) { QWidget::leaveEvent(event); if (m_cursorColor == palette().link()) { - m_cursorColor = palette().text(); - update(); + m_cursorColor = palette().text(); + update(); } } @@ -288,8 +288,10 @@ int CustomRuler::outPoint() const void CustomRuler::slotMoveRuler(int newPos) { - m_offset = newPos; - update(); + if (m_offset != newPos) { + m_offset = newPos; + update(); + } } int CustomRuler::offset() const diff --git a/src/customruler.h b/src/customruler.h index 1bebf0b3..33e006fa 100644 --- a/src/customruler.h +++ b/src/customruler.h @@ -45,9 +45,9 @@ public: int outPoint() const; int inPoint() const; void setDuration(int d); - void setZone(QPoint p); + void setZone(const QPoint &p); int offset() const; - void updateProjectFps(Timecode t); + void updateProjectFps(const Timecode &t); void updateFrameSize(); void updatePalette(); diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index b0ff7ba2..0697c375 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -288,7 +288,7 @@ void CustomTrackView::checkAutoScroll() }*/ -int CustomTrackView::getFrameWidth() +int CustomTrackView::getFrameWidth() const { return (int) (m_tracksHeight * m_document->mltProfile().display_aspect_num / m_document->mltProfile().display_aspect_den + 0.5); } @@ -1254,7 +1254,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_blockRefresh = false; } -void CustomTrackView::rebuildGroup(int childTrack, GenTime childPos) +void CustomTrackView::rebuildGroup(int childTrack, const GenTime &childPos) { const QPointF p((int)childPos.frames(m_document->fps()), childTrack * m_tracksHeight + m_tracksHeight / 2); QList list = scene()->items(p); diff --git a/src/customtrackview.h b/src/customtrackview.h index 0242a211..3dff4062 100644 --- a/src/customtrackview.h +++ b/src/customtrackview.h @@ -204,7 +204,7 @@ public: * Check whether given track has a clip with audio in it. */ bool hasAudio(int track) const; - int getFrameWidth(); + int getFrameWidth() const; /** @brief Returns last requested seeking pos (or SEEK_INACTIVE if no seek). */ int seekPosition() const; @@ -276,7 +276,7 @@ public slots: /** @brief Rebuilds a group to fit again after children changed. * @param childTrack the track of one of the groups children * @param childPos The position of the same child */ - void rebuildGroup(int childTrack, GenTime childPos); + void rebuildGroup(int childTrack, const GenTime &childPos); /** @brief Rebuilds a group to fit again after children changed. * @param group The group to rebuild */ void rebuildGroup(AbstractGroupItem *group); -- 2.39.2