Cleanup + fix another QDomDocument usage

svn path=/trunk/kdenlive/; revision=3190

diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp
index 163626aa6c225b3abc2fc4805fca71d8b6d10531..e3640e4d7b10d431c885e541396d5b9e5cd4b80c 100644 (file)
--- a/src/kdenlivedoc.cpp
+++ b/src/kdenlivedoc.cpp
@@ -325,22 +325,22 @@ QDomDocument KdenliveDoc::createEmptyDocument(const int videotracks, const int a
 
 
 void KdenliveDoc::syncGuides(QList <Guide *> guides) {
-    QDomDocument doc;
-    QDomElement e;
     m_guidesXml.clear();
-    m_guidesXml = doc.createElement("guides");
+    QDomElement guideNode = m_guidesXml.createElement("guides");
+    m_guidesXml.appendChild(guideNode);
+    QDomElement e;
 
     for (int i = 0; i < guides.count(); i++) {
-        e = doc.createElement("guide");
+        e = m_guidesXml.createElement("guide");
         e.setAttribute("time", guides.at(i)->position().ms() / 1000);
         e.setAttribute("comment", guides.at(i)->label());
-        m_guidesXml.appendChild(e);
+        guideNode.appendChild(e);
     }
     emit guidesUpdated();
 }
 
 QDomElement KdenliveDoc::guidesXml() const {
-    return m_guidesXml;
+    return m_guidesXml.documentElement();
 }
 
 void KdenliveDoc::slotAutoSave() {
@@ -986,7 +986,7 @@ bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene) {
     addedXml.appendChild(markers);
 
     // Add guides
-    if (!m_guidesXml.isNull()) addedXml.appendChild(sceneList.importNode(m_guidesXml, true));
+    if (!m_guidesXml.isNull()) addedXml.appendChild(sceneList.importNode(m_guidesXml.documentElement(), true));
 
     // Add clip groups
     addedXml.appendChild(sceneList.importNode(m_clipManager->groupsXml(), true));
@@ -1206,14 +1206,6 @@ int KdenliveDoc::getProducerDuration(const QString &id) {
     return result;
 }
 
-
-QDomDocument KdenliveDoc::generateSceneList() {
-    QDomDocument doc;
-    QDomElement westley = doc.createElement("westley");
-    doc.appendChild(westley);
-    QDomElement prod = doc.createElement("producer");
-}
-
 QDomDocument KdenliveDoc::toXml() {
     return m_document;
 }

diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h
index f85d6592c00d78329149072eca7c157a90e715c4..fe7f61b0bc2ac874fbfb4d8b45107faf35e98aea 100644 (file)
--- a/src/kdenlivedoc.h
+++ b/src/kdenlivedoc.h
@@ -64,7 +64,7 @@ Q_OBJECT public:
     void setProducerDuration(const QString &id, int duration);
     int getProducerDuration(const QString &id);
     Render *renderer();
-    QDomElement m_guidesXml;
+    QDomDocument m_guidesXml;
     QDomElement guidesXml() const;
     ClipManager *clipManager();
     void addClip(QDomElement elem, QString clipId, bool createClipItem = true);
@@ -128,7 +128,6 @@ private:
     Timecode m_timecode;
     Render *m_render;
     QUndoStack *m_commandStack;
-    QDomDocument generateSceneList();
     ClipManager *m_clipManager;
     MltVideoProfile m_profile;
     QTimer *m_autoSaveTimer;

diff --git a/src/projectlistview.cpp b/src/projectlistview.cpp
index 08e774c11652b403e44b1f33e90d3965fba3aba6..1fcd11ca6d3ff69ffe0a7f3fd45ccfed6e753259 100644 (file)
--- a/src/projectlistview.cpp
+++ b/src/projectlistview.cpp
@@ -214,7 +214,6 @@ void ProjectListView::mouseMoveEvent(QMouseEvent *event) {
         if (clickItem) {
             QDrag *drag = new QDrag(this);
             QMimeData *mimeData = new QMimeData;
-            QDomDocument doc;
             const QList <QTreeWidgetItem *> list = selectedItems();
             QStringList ids;
             foreach(const QTreeWidgetItem *item, list) {