X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fabstractclipitem.cpp;h=a616219cf4e9d6e71909129e419f5e82d16e7aa8;hb=86e06b615e11677bf2b1e83d1f46754946006e41;hp=0abf87aa6a116cfd4e2a851f1324904be74ccee6;hpb=cb7c6a3410bf63a60532d4cd24f59eea0a71304f;p=kdenlive diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp index 0abf87aa..a616219c 100644 --- a/src/abstractclipitem.cpp +++ b/src/abstractclipitem.cpp @@ -122,7 +122,7 @@ GenTime AbstractClipItem::cropDuration() const return m_info.cropDuration; } -void AbstractClipItem::setCropStart(GenTime pos) +void AbstractClipItem::setCropStart(const GenTime &pos) { m_info.cropStart = pos; } @@ -261,7 +261,7 @@ GenTime AbstractClipItem::maxDuration() const return m_maxDuration; } -void AbstractClipItem::drawKeyFrames(QPainter *painter, const QTransform transformation, bool limitedKeyFrames) +void AbstractClipItem::drawKeyFrames(QPainter *painter, const QTransform &transformation, bool limitedKeyFrames) { if (m_keyframes.count() < 1) return; @@ -279,7 +279,7 @@ void AbstractClipItem::drawKeyFrames(QPainter *painter, const QTransform transfo x2 = br.right(); if (limitedKeyFrames) { QMap::const_iterator end = m_keyframes.constEnd(); - end--; + --end; x2 = x1 + maxw * (end.key() - start); x1 += maxw * (m_keyframes.constBegin().key() - start); } @@ -357,11 +357,9 @@ int AbstractClipItem::mouseOverKeyFrames(QPointF pos, double maxOffset) double maxh = br.height() / 100.0 * m_keyframeFactor; if (m_keyframes.count() > 0) { QMap::const_iterator i = m_keyframes.constBegin(); - double x1; - double y1; while (i != m_keyframes.constEnd()) { - x1 = br.x() + maxw * (i.key() - cropStart().frames(m_fps)); - y1 = br.bottom() - (i.value() - m_keyframeOffset) * maxh; + double x1 = br.x() + maxw * (i.key() - cropStart().frames(m_fps)); + double y1 = br.bottom() - (i.value() - m_keyframeOffset) * maxh; if (qAbs(pos.x() - x1) < maxOffset && qAbs(pos.y() - y1) < 10) { setToolTip('[' + QString::number((GenTime(i.key(), m_fps) - cropStart()).seconds(), 'f', 2) + i18n("seconds") + ", " + QString::number(i.value(), 'f', 1) + ']'); return i.key(); @@ -547,3 +545,5 @@ bool AbstractClipItem::isMainSelectedClip() return m_isMainSelectedClip; } + +#include "abstractclipitem.moc"