summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Mardelle <jb@kdenlive.org>2014-04-03 19:36:41 (GMT)
committerVincent PINON <vincent.pinon@laposte.net>2014-04-28 23:04:19 (GMT)
commit76343987c7237db0220923ac8158691e96a112ab (patch)
treeab93ce8811a45bd5f41c38a4d966b80f5e3bdf41
parentd1e8d53d110243c284406578f65657d7d404717f (diff)
Fix some compiler reported errors
-rw-r--r--src/projecttree/meltjob.cpp2
-rw-r--r--src/statusbarmessagelabel.cpp2
-rw-r--r--src/tracksconfigdialog.h3
-rw-r--r--src/trackview.cpp2
4 files changed, 4 insertions, 5 deletions
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);