Use char for single character [krazy 1-44] by Mikko Rapeli

[kdenlive] / src / abstractclipitem.cpp

diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp
index 030ec846caeb06eced3d8eef9b4aecedf3d35804..1a0adfd0f2f8b9adcf1d61cd0eb2ff1eb709f3d4 100644 (file)
--- a/src/abstractclipitem.cpp
+++ b/src/abstractclipitem.cpp
@@ -24,12 +24,13 @@
 
 #include <KDebug>
 #include <KLocale>
+#include <KGlobalSettings>
 
 #include <QPainter>
 #include <QToolTip>
 #include <QGraphicsSceneMouseEvent>
 
-AbstractClipItem::AbstractClipItem(const ItemInfo info, const QRectF& rect, double fps) :
+AbstractClipItem::AbstractClipItem(const ItemInfo &info, const QRectF& rect, double fps) :
         QObject(),
         QGraphicsRectItem(rect),
         m_info(info),
@@ -38,9 +39,6 @@ AbstractClipItem::AbstractClipItem(const ItemInfo info, const QRectF& rect, doub
         m_keyframeFactor(1),
         m_keyframeOffset(0),
         m_fps(fps)
-#if QT_VERSION >= 0x040600
-        , m_closeAnimation(NULL)
-#endif
 {
     setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
 #if QT_VERSION >= 0x040600
@@ -51,29 +49,31 @@ AbstractClipItem::AbstractClipItem(const ItemInfo info, const QRectF& rect, doub
 
 AbstractClipItem::~AbstractClipItem()
 {
-#if QT_VERSION >= 0x040600
-    if (m_closeAnimation) delete m_closeAnimation;
-#endif
 }
 
 void AbstractClipItem::closeAnimation()
 {
 #if QT_VERSION >= 0x040600
-    if (m_closeAnimation) return;
+    if (!isEnabled()) return;
     setEnabled(false);
-    m_closeAnimation = new QPropertyAnimation(this, "rect");
-    connect(m_closeAnimation, SIGNAL(finished()), this, SLOT(deleteLater()));
-    m_closeAnimation->setDuration(200);
+    if (!(KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects)) {
+        // animation disabled
+        deleteLater();
+        return;
+    }
+    QPropertyAnimation *closeAnimation = new QPropertyAnimation(this, "rect");
+    connect(closeAnimation, SIGNAL(finished()), this, SLOT(deleteLater()));
+    closeAnimation->setDuration(200);
     QRectF r = rect();
     QRectF r2 = r;
     r2.setLeft(r.left() + r.width() / 2);
     r2.setTop(r.top() + r.height() / 2);
     r2.setWidth(1);
     r2.setHeight(1);
-    m_closeAnimation->setStartValue(r);
-    m_closeAnimation->setEndValue(r2);
-    m_closeAnimation->setEasingCurve(QEasingCurve::InQuad);
-    m_closeAnimation->start();
+    closeAnimation->setStartValue(r);
+    closeAnimation->setEndValue(r2);
+    closeAnimation->setEasingCurve(QEasingCurve::InQuad);
+    closeAnimation->start(QAbstractAnimation::DeleteWhenStopped);
 #endif
 }
 
@@ -273,7 +273,7 @@ void AbstractClipItem::drawKeyFrames(QPainter *painter, bool limitedKeyFrames)
         }
         y1 = br.bottom() - (m_keyframeDefault - m_keyframeOffset) * maxh;
         QLineF l(x1, y1, x2, y1);
-        QLineF l2 = painter->matrix().map(l);
+        QLineF l2 = painter->worldTransform().map(l);
         painter->setPen(QColor(168, 168, 168, 180));
         painter->drawLine(l2);
         painter->setPen(QColor(108, 108, 108, 180));
@@ -294,7 +294,7 @@ void AbstractClipItem::drawKeyFrames(QPainter *painter, bool limitedKeyFrames)
     // make sure line begins with clip beginning
     if (!limitedKeyFrames && i.key() != start) {
         QLineF l(br.x(), y1, x1, y1);
-        l2 = painter->matrix().map(l);
+        l2 = painter->worldTransform().map(l);
         painter->drawLine(l2);
     }
     while (i != m_keyframes.constEnd()) {
@@ -314,7 +314,7 @@ void AbstractClipItem::drawKeyFrames(QPainter *painter, bool limitedKeyFrames)
             y2 = br.bottom() - (i.value() - m_keyframeOffset) * maxh;
         }
         QLineF l(x1, y1, x2, y2);
-        l2 = painter->matrix().map(l);
+        l2 = painter->worldTransform().map(l);
         painter->drawLine(l2);
         if (active) {
             const QRectF frame(l2.x1() - 3, l2.y1() - 3, 6, 6);
@@ -327,7 +327,7 @@ void AbstractClipItem::drawKeyFrames(QPainter *painter, bool limitedKeyFrames)
     // make sure line ends at clip end
     if (!limitedKeyFrames && x1 != br.right()) {
         QLineF l(x1, y1, br.right(), y1);
-        painter->drawLine(painter->matrix().map(l));
+        painter->drawLine(painter->worldTransform().map(l));
     }
 
     if (active && m_keyframes.count() > 1) {
@@ -351,7 +351,7 @@ int AbstractClipItem::mouseOverKeyFrames(QPointF pos, double maxOffset)
             x1 = br.x() + maxw * (i.key() - cropStart().frames(m_fps));
             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) + "]");
+                setToolTip('[' + QString::number((GenTime(i.key(), m_fps) - cropStart()).seconds(), 'f', 2) + i18n("seconds") + ", " + QString::number(i.value(), 'f', 1) + ']');
                 return i.key();
             } else if (x1 > pos.x()) {
                 break;
@@ -395,7 +395,7 @@ double AbstractClipItem::selectedKeyFrameValue() const
     return m_keyframes.value(m_selectedKeyframe);
 }
 
-void AbstractClipItem::updateKeyFramePos(const GenTime pos, const double value)
+void AbstractClipItem::updateKeyFramePos(const GenTime &pos, const double value)
 {
     if (!m_keyframes.contains(m_editedKeyframe))
         return;
@@ -437,7 +437,7 @@ int AbstractClipItem::keyFrameNumber() const
     return m_keyframes.count();
 }
 
-int AbstractClipItem::addKeyFrame(const GenTime pos, const double value)
+int AbstractClipItem::addKeyFrame(const GenTime &pos, const double value)
 {
     QRectF br = sceneBoundingRect();
     double maxh = 100.0 / br.height() / m_keyframeFactor;