X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkdenlivedoc.cpp;h=01cd32e3397d052a6e9bfd9e69ee155975b8156a;hb=5d4746e4c3e8665de83e6d281dcd08a46cd22c31;hp=05851246b7c8a1ecd03aed86d7094490d8ed6b90;hpb=f223c83a30c943983283f5e9eacc5bbcc8278329;p=kdenlive

diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp
index 05851246..01cd32e3 100644
--- a/src/kdenlivedoc.cpp
+++ b/src/kdenlivedoc.cpp
@@ -35,7 +35,7 @@
 #include <KStandardDirs>
 #include <KMessageBox>
 #include <KProgressDialog>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KFileDialog>
 #include <KIO/NetAccess>
 #include <KIO/CopyJob>
@@ -50,6 +50,9 @@
 #include <QFile>
 #include <QInputDialog>
 #include <QDomImplementation>
+#include <QUndoGroup>
+#include <QTimer>
+#include <QUndoStack>
 
 #include <mlt++/Mlt.h>
 
@@ -443,7 +446,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(int videotracks, int audiotracks)
     return createEmptyDocument(m_tracksList);
 }
 
-QDomDocument KdenliveDoc::createEmptyDocument(QList <TrackInfo> tracks)
+QDomDocument KdenliveDoc::createEmptyDocument(const QList <TrackInfo> &tracks)
 {
     // Creating new document
     QDomDocument doc;
@@ -500,7 +503,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(QList <TrackInfo> tracks)
 
     QDomElement tractor = doc.createElement("tractor");
     tractor.setAttribute("id", "maintractor");
-    QDomElement multitrack = doc.createElement("multitrack");
+    //QDomElement multitrack = doc.createElement("multitrack");
     QDomElement playlist = doc.createElement("playlist");
     playlist.setAttribute("id", "black_track");
     mlt.appendChild(playlist);
@@ -577,7 +580,7 @@ QDomDocument KdenliveDoc::createEmptyDocument(QList <TrackInfo> tracks)
 }
 
 
-void KdenliveDoc::syncGuides(QList <Guide *> guides)
+void KdenliveDoc::syncGuides(const QList <Guide *> &guides)
 {
     m_guidesXml.clear();
     QDomElement guideNode = m_guidesXml.createElement("guides");
@@ -886,8 +889,10 @@ MltVideoProfile KdenliveDoc::mltProfile() const
 
 bool KdenliveDoc::setProfilePath(QString path)
 {
-    if (path.isEmpty()) path = KdenliveSettings::default_profile();
-    if (path.isEmpty()) path = "dv_pal";
+    if (path.isEmpty())
+        path = KdenliveSettings::default_profile();
+    if (path.isEmpty())
+        path = QLatin1String("dv_pal");
     m_profile = ProfilesDialog::getVideoProfile(path);
     double current_fps = m_fps;
     if (m_profile.path.isEmpty()) {
@@ -990,7 +995,7 @@ void KdenliveDoc::updateClip(const QString &id)
     emit updateClipDisplay(id);
 }
 
-int KdenliveDoc::getFramePos(QString duration)
+int KdenliveDoc::getFramePos(const QString &duration)
 {
     return m_timecode.getFrameCount(duration);
 }