[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/next] src: Fix some compiler reported errors
From:       Vincent PINON <vincent.pinon () laposte ! net>
Date:       2014-04-30 20:27:58
Message-ID: E1Wfb6k-0003AX-PQ () scm ! kde ! org
[Download RAW message or body]

Git commit 76343987c7237db0220923ac8158691e96a112ab by Vincent PINON, on behalf of \
Jean-Baptiste Mardelle. Committed on 03/04/2014 at 19:36.
Pushed by vpinon into branch 'next'.

Fix some compiler reported errors

M  +1    -1    src/projecttree/meltjob.cpp
M  +1    -1    src/statusbarmessagelabel.cpp
M  +1    -2    src/tracksconfigdialog.h
M  +1    -1    src/trackview.cpp

http://commits.kde.org/kdenlive/76343987c7237db0220923ac8158691e96a112ab

diff --git a/src/projecttree/meltjob.cpp b/src/projecttree/meltjob.cpp
index a324b84..b0c33d5 100644
--- a/src/projecttree/meltjob.cpp
+++ b/src/projecttree/meltjob.cpp
@@ -58,7 +58,7 @@ void MeltJob::setProducer(Mlt::Producer *producer, const KUrl &url)
 {
     m_url = QString::fromUtf8(producer->get("resource"));
     if (m_url == QLatin1String("<playlist>") || m_url == QLatin1String("<tractor>") \
                || m_url == QLatin1String("<producer>"))
-	m_url == url.path();
+        m_url = url.path();
 }
 
 void MeltJob::startJob()
diff --git a/src/statusbarmessagelabel.cpp b/src/statusbarmessagelabel.cpp
index 1cb0a06..ee6c7f7 100644
--- a/src/statusbarmessagelabel.cpp
+++ b/src/statusbarmessagelabel.cpp
@@ -95,7 +95,7 @@ void StatusBarMessageLabel::setMessage(const QString& text,
 
             // Message with normal priority
             m_messageQueue.push_back(item);
-            if (!m_queueTimer.elapsed() >= m_currentMessage.timeoutMillis) {
+            if (m_queueTimer.elapsed() >= m_currentMessage.timeoutMillis) {
                 m_queueTimer.start(0);
             }
 
diff --git a/src/tracksconfigdialog.h b/src/tracksconfigdialog.h
index 0b513b9..f07d1ea 100644
--- a/src/tracksconfigdialog.h
+++ b/src/tracksconfigdialog.h
@@ -36,8 +36,7 @@ private slots:
     void emitCommitData();
 };
 
-
-struct TrackInfo;
+class TrackInfo;
 class KdenliveDoc;
 class QTableWidgetItem;
 
diff --git a/src/trackview.cpp b/src/trackview.cpp
index a484b86..e98d535 100644
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -246,7 +246,7 @@ void TrackView::parseDocument(const QDomDocument &doc)
                 }
             }
             if (p.attribute("id") != playlist_name) { // then it didn't work.
-                kDebug() << "NO PLAYLIST FOUND FOR TRACK " + pos;
+                kDebug() << "NO PLAYLIST FOUND FOR TRACK " << pos;
             }
             if (e.attribute("hide") == "video") {
                 m_doc->switchTrackVideo(i - 1, true);


[prev in list] [next in list] [prev in thread] [next in thread]