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

[kdenlive] / src / trackview.cpp

diff --git a/src/trackview.cpp b/src/trackview.cpp
index 67cf01cd92c2581440b67401367a0787e62b0250..72cf2823ec818a2f22f0b9796f78697fb7d911e5 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -18,14 +18,9 @@
  ***************************************************************************/
 
 
-#include <QScrollBar>
-
-#include <KDebug>
-#include <KMessageBox>
-
+#include "trackview.h"
 #include "definitions.h"
 #include "headertrack.h"
-#include "trackview.h"
 #include "clipitem.h"
 #include "transition.h"
 #include "kdenlivesettings.h"
@@ -36,6 +31,11 @@
 #include "customtrackview.h"
 #include "initeffects.h"
 
+#include <KDebug>
+#include <KMessageBox>
+
+#include <QScrollBar>
+
 TrackView::TrackView(KdenliveDoc *doc, QWidget *parent)
         : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0) {
 
@@ -121,7 +121,7 @@ void TrackView::setDuration(int dur) {
 
 void TrackView::parseDocument(QDomDocument doc) {
     int cursorPos = 0;
-    m_documentErrors = QString();
+    m_documentErrors.clear();
     // kDebug() << "//// DOCUMENT: " << doc.toString();
     /*QDomNode props = doc.elementsByTagName("properties").item(0);
     if (!props.isNull()) {
@@ -395,8 +395,8 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) {
             QString id = idString;
             double speed = 1.0;
             if (idString.startsWith("slowmotion")) {
-                id = idString.section(":", 1, 1);
-                speed = idString.section(":", 2, 2).toDouble();
+                id = idString.section(':', 1, 1);
+                speed = idString.section(':', 2, 2).toDouble();
             } else id = id.section('_', 0, 0);
             DocClipBase *clip = m_doc->clipManager()->getClipById(id);
             if (clip != NULL) {
@@ -488,7 +488,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) {
                                         endvalue = effectparam.text().toDouble() * factor;
                                 }
                                 // add first keyframe
-                                keyframes.append(QString::number(effectin) + ":" + QString::number(startvalue) + ";" + QString::number(effectout) + ":" + QString::number(endvalue) + ";");
+                                keyframes.append(QString::number(effectin) + ':' + QString::number(startvalue) + ';' + QString::number(effectout) + ':' + QString::number(endvalue) + ';');
                                 QDomNode lastParsedEffect;
                                 ix++;
                                 QDomNode n2 = effects.at(ix);
@@ -513,7 +513,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) {
                                         }
                                     }
                                     if (continueParsing) {
-                                        keyframes.append(QString::number(effectout) + ":" + QString::number(endvalue) + ";");
+                                        keyframes.append(QString::number(effectout) + ':' + QString::number(endvalue) + ';');
                                         ix++;
                                     }
                                 }