[PATCH by Ray Lehtiniemi] Do not return references to temporaries.

[kdenlive] / src / transition.cpp

diff --git a/src/transition.cpp b/src/transition.cpp
index c54ce3bd9f136c8b1f0e70d96f51f887b67c0b15..e345d08f149934ace2049f7f27c4a64cf8359372 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -15,24 +15,22 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QBrush>
-#include <QDomElement>
-#include <QPainter>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QScrollBar>
-#include <QStyleOptionGraphicsItem>
-
-#include <kdebug.h>
-#include <KIcon>
-#include <klocale.h>
-
 #include "transition.h"
 #include "clipitem.h"
 #include "kdenlivesettings.h"
 #include "customtrackscene.h"
 #include "mainwindow.h"
 
+#include <kdebug.h>
+#include <KIcon>
+#include <klocale.h>
+
+#include <QBrush>
+#include <QDomElement>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
+
+
 Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) : AbstractClipItem(info, QRectF(), fps), m_automaticTransition(automaticTransition), m_forceTransitionTrack(false) {
     setZValue(2);
     setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (qreal)(KdenliveSettings::trackheight() / 3 * 2 - 1));
@@ -162,7 +160,7 @@ void Transition::paint(QPainter *painter,
     //painter->drawPixmap(painter->matrix().map(p1) + QPointF(5, 0), transitionPixmap());
     QString text = transitionName();
     if (m_forceTransitionTrack) text.append("|>");
-    QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, " " + text + " ");
+    QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + text + ' ');
     painter->fillRect(txtBounding, QBrush(QColor(50, 50, 0, 150)));
     txtBounding.translate(QPointF(1, 1));
     painter->setPen(QColor(255, 255, 255, 255));
@@ -247,6 +245,8 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value
 
 
 OPERATIONTYPE Transition::operationMode(QPointF pos) {
+    if (isItemLocked()) return NONE;
+
     const double scale = projectScene()->scale();
     double maximumOffset = 6 / scale;