Cleanup

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

diff --git a/src/addeffectcommand.cpp b/src/addeffectcommand.cpp
index 2aa5b8e7ce197a8a8d2407b9189e47b904a18dd8..5e09957c7890a8f253eabfeee1b16773dcb6bc48 100644 (file)
--- a/src/addeffectcommand.cpp
+++ b/src/addeffectcommand.cpp
@@ -32,8 +32,8 @@ AddEffectCommand::AddEffectCommand(CustomTrackView *view, const int track, GenTi
         m_doIt(doIt)
 {
     QString effectName;
-    QDomNode namenode = m_effect.elementsByTagName("name").item(0);
-    if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+    QDomElement namenode = m_effect.firstChildElement("name");
+    if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data());
     else effectName = i18n("effect");
     if (doIt) setText(i18n("Add %1", effectName));
     else setText(i18n("Delete %1", effectName));

diff --git a/src/archivewidget.cpp b/src/archivewidget.cpp
index fb3369036ca02390457f379c9527b74cfd111311..363781df6423abef52f85f0cde8c52e71ce24da4 100644 (file)
--- a/src/archivewidget.cpp
+++ b/src/archivewidget.cpp
@@ -544,7 +544,7 @@ bool ArchiveWidget::processProjectFile()
     if (isArchive) basePath = "$CURRENTPATH";
     else basePath = archive_url->url().path(KUrl::RemoveTrailingSlash);
     mlt.setAttribute("root", basePath);
-    QDomElement project = mlt.elementsByTagName("kdenlivedoc").at(0).toElement();
+    QDomElement project = mlt.firstChildElement("kdenlivedoc");
     project.setAttribute("projectfolder", basePath);
 
     // process kdenlive producers

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 04874a6be5f1ab5de2e2205c7fce1362dac1bcb1..bb92463b9631b51ca2afedf05c5377d74821bb74 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -1690,8 +1690,8 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem *
     QList<QGraphicsItem *> itemList = group->childItems();
     QUndoCommand *effectCommand = new QUndoCommand();
     QString effectName;
-    QDomNode namenode = effect.elementsByTagName("name").item(0);
-    if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+    QDomElement namenode = effect.firstChildElement("name");
+    if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data());
     else effectName = i18n("effect");
     effectCommand->setText(i18n("Add %1", effectName));
     int count = 0;
@@ -1730,8 +1730,8 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track)
     QList<QGraphicsItem *> itemList;
     QUndoCommand *effectCommand = new QUndoCommand();
     QString effectName;
-    QDomNode namenode = effect.elementsByTagName("name").item(0);
-    if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+    QDomElement namenode = effect.firstChildElement("name");
+    if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data());
     else effectName = i18n("effect");
     effectCommand->setText(i18n("Add %1", effectName));
 
@@ -1825,8 +1825,8 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, int track, QDomElement ef
         QList<QGraphicsItem *> items = m_selectionGroup->childItems();
         QUndoCommand *delCommand = new QUndoCommand();
         QString effectName;
-        QDomNode namenode = effect.elementsByTagName("name").item(0);
-        if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+        QDomElement namenode = effect.firstChildElement("name");
+        if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data());
         else effectName = i18n("effect");
         delCommand->setText(i18n("Delete %1", effectName));
 

diff --git a/src/documentchecker.cpp b/src/documentchecker.cpp
index 2cdd9325e573aff485dd6ad5a3338740b36b2460..ee7ffa64dd6f98349a2f5033dcd0267810f192f1 100644 (file)
--- a/src/documentchecker.cpp
+++ b/src/documentchecker.cpp
@@ -337,8 +337,7 @@ bool DocumentChecker::hasErrorInClips()
     
     if (missingProxies.count() > 0) {
         // original doc was modified
-        QDomNode infoXmlNode = m_doc.elementsByTagName("kdenlivedoc").at(0);
-        QDomElement infoXml = infoXmlNode.toElement();
+        QDomElement infoXml = m_doc.elementsByTagName("kdenlivedoc").at(0).toElement();
         infoXml.setAttribute("modified", "1");
     }
     
@@ -430,8 +429,7 @@ void DocumentChecker::slotSearchClips()
     m_ui.recursiveSearch->setEnabled(true);
     if (fixed) {
         // original doc was modified
-        QDomNode infoXmlNode = m_doc.elementsByTagName("kdenlivedoc").at(0);
-        QDomElement infoXml = infoXmlNode.toElement();
+        QDomElement infoXml = m_doc.elementsByTagName("kdenlivedoc").at(0).toElement();
         infoXml.setAttribute("modified", "1");
     }
     checkStatus();
@@ -708,8 +706,7 @@ void DocumentChecker::slotFixDuration()
         ix++;
         child = m_ui.treeWidget->topLevelItem(ix);
     }
-    QDomNode infoXmlNode = m_doc.elementsByTagName("kdenlivedoc").at(0);
-    QDomElement infoXml = infoXmlNode.toElement();
+    QDomElement infoXml = m_doc.elementsByTagName("kdenlivedoc").at(0).toElement();
     infoXml.setAttribute("modified", "1");
     m_ui.fixDuration->setEnabled(false);
     checkStatus();
@@ -771,8 +768,8 @@ void DocumentChecker::slotDeleteSelected()
         QDomNodeList producers = m_doc.elementsByTagName("producer");
         QDomNodeList infoproducers = m_doc.elementsByTagName("kdenlive_producer");
 
-        QDomElement mlt = m_doc.firstChildElement("mlt");
-        QDomElement kdenlivedoc = mlt.firstChildElement("kdenlivedoc");
+        QDomNode mlt = m_doc.elementsByTagName("mlt").at(0);
+        QDomNode kdenlivedoc = m_doc.elementsByTagName("kdenlivedoc").at(0);
 
         for (int i = 0, j = 0; i < infoproducers.count() && j < deletedIds.count(); i++) {
             e = infoproducers.item(i).toElement();
@@ -809,8 +806,7 @@ void DocumentChecker::slotDeleteSelected()
                 }
             }
         }
-        QDomNode infoXmlNode = m_doc.elementsByTagName("kdenlivedoc").at(0);
-        QDomElement infoXml = infoXmlNode.toElement();
+        QDomElement infoXml = m_doc.elementsByTagName("kdenlivedoc").at(0).toElement();
         infoXml.setAttribute("modified", "1");
         checkStatus();
     }

diff --git a/src/documentvalidator.cpp b/src/documentvalidator.cpp
index 7a6b5208391df9f8c8c0a0d9b9289f5575951ee8..64c595c790932a845e561d1319e056274ff0b02b 100644 (file)
--- a/src/documentvalidator.cpp
+++ b/src/documentvalidator.cpp
@@ -116,7 +116,7 @@ bool DocumentValidator::validate(const double currentVersion)
                 // Looks like one MLT track is missing, remove the extra Kdenlive track if there is one.
                 if (tracksinfo.count() != tracks.count() - 1) {
                     // The Kdenlive tracks are not ok, clear and rebuild them
-                    QDomNode tinfo = kdenliveDoc.elementsByTagName("tracksinfo").at(0);
+                    QDomNode tinfo = kdenliveDoc.firstChildElement("tracksinfo");
                     QDomNode tnode = tinfo.firstChild();
                     while (!tnode.isNull()) {
                         tinfo.removeChild(tnode);

diff --git a/src/editeffectcommand.cpp b/src/editeffectcommand.cpp
index 9bbebc748651bf0efb4652c8098db84ab33a8861..b6a98145f2c0ab8605a3a859edafd30e5e9519b6 100644 (file)
--- a/src/editeffectcommand.cpp
+++ b/src/editeffectcommand.cpp
@@ -34,8 +34,8 @@ EditEffectCommand::EditEffectCommand(CustomTrackView *view, const int track, Gen
         m_doIt(doIt)
 {
     QString effectName;
-    QDomNode namenode = effect.elementsByTagName("name").item(0);
-    if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+    QDomElement namenode = effect.firstChildElement("name");
+    if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data());
     else effectName = i18n("effect");
     setText(i18n("Edit effect %1", effectName));
 }

diff --git a/src/edittransitioncommand.cpp b/src/edittransitioncommand.cpp
index 58346c4d802064a403ad0dd228c9bbacd590b219..dd3afe7da269871f6e9001db0b3e11bc10a7e43a 100644 (file)
--- a/src/edittransitioncommand.cpp
+++ b/src/edittransitioncommand.cpp
@@ -30,8 +30,8 @@ EditTransitionCommand::EditTransitionCommand(CustomTrackView *view, const int tr
 {
     m_effect = effect.cloneNode().toElement();
     QString effectName;
-    QDomNode namenode = effect.elementsByTagName("name").item(0);
-    if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+    QDomElement namenode = effect.firstChildElement("name");
+    if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data());
     else effectName = i18n("effect");
     setText(i18n("Edit transition %1", effectName));
 }

diff --git a/src/effectslist.cpp b/src/effectslist.cpp
index d01b46e404ed96beac02488582b982b58f25b2d2..dd523db728d3de1ed589596c4083a6c14aed7a7c 100644 (file)
--- a/src/effectslist.cpp
+++ b/src/effectslist.cpp
@@ -38,8 +38,8 @@ QDomElement EffectsList::getEffectByName(const QString & name) const
     QDomNodeList effects = m_baseElement.childNodes();
     for (int i = 0; i < effects.count(); i++) {
         QDomElement effect =  effects.at(i).toElement();
-        QDomNode namenode = effect.firstChildElement("name");
-        if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+        QDomElement namenode = effect.firstChildElement("name");
+        if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data());
         if (name == effectName) {
             QDomNodeList params = effect.elementsByTagName("parameter");
             for (int i = 0; i < params.count(); i++) {
@@ -100,8 +100,8 @@ QStringList EffectsList::effectIdInfo(const int ix) const
 {
     QStringList info;
     QDomElement effect = m_baseElement.childNodes().at(ix).toElement();
-    QDomNode namenode = effect.firstChildElement("name");
-    info << i18n(namenode.toElement().text().toUtf8().data()) << effect.attribute("tag") << effect.attribute("id");
+    QDomElement namenode = effect.firstChildElement("name");
+    info << i18n(namenode.text().toUtf8().data()) << effect.attribute("tag") << effect.attribute("id");
     return info;
 }
 
@@ -111,8 +111,8 @@ QStringList EffectsList::effectNames()
     QDomNodeList effects = m_baseElement.childNodes();
     for (int i = 0; i < effects.count(); i++) {
         QDomElement effect =  effects.at(i).toElement();
-        QDomNode namenode = effect.firstChildElement("name");
-        if (!namenode.isNull()) list.append(i18n(namenode.toElement().text().toUtf8().data()));
+        QDomElement namenode = effect.firstChildElement("name");
+        if (!namenode.isNull()) list.append(i18n(namenode.text().toUtf8().data()));
     }
     return list;
 }
@@ -132,17 +132,17 @@ QString EffectsList::getInfoFromIndex(const int ix) const
 QString EffectsList::getEffectInfo(const QDomElement effect) const
 {
     QString info;
-    QDomNode namenode = effect.firstChildElement("description");
+    QDomElement namenode = effect.firstChildElement("description");
     if (!namenode.isNull())
         info = i18n(namenode.firstChild().nodeValue().simplified().toUtf8().data());
 
     namenode = effect.firstChildElement("author");
     if (!namenode.isNull())
-        info.append("<br /><strong>" + i18n("Author:") + " </strong>" + i18n(namenode.toElement().text().toUtf8().data()));
+        info.append("<br /><strong>" + i18n("Author:") + " </strong>" + i18n(namenode.text().toUtf8().data()));
 
     namenode = effect.firstChildElement("version");
     if (!namenode.isNull())
-        info.append(QString(" (%1)").arg(namenode.toElement().text()));
+        info.append(QString(" (%1)").arg(namenode.text()));
 
     return info;
 }

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
index 53cb6c4fc8817a07a9f6b847ea0795fc22af0ccb..d188762525d2bacf0343b390606e1a6d5f73cc8c 100644 (file)
--- a/src/effectstackview.cpp
+++ b/src/effectstackview.cpp
@@ -266,17 +266,17 @@ void EffectStackView::setupListView(int ix)
         doc.appendChild(doc.importNode(d, true));
         kDebug() << "IMPORTED STK: " << doc.toString();*/
 
-        QDomNode namenode = d.elementsByTagName("name").item(0);
+        QDomElement namenode = d.firstChildElement("name");
         if (!namenode.isNull()) {
             // Issue 238: Add icons for effect type in effectstack.
             // Logic more or less copied from initeffects.cpp
             QString type = d.attribute("type", QString());
             if ("audio" == type) {
-                item = new QListWidgetItem(audioIcon, i18n(namenode.toElement().text().toUtf8().data()), m_ui.effectlist);
+                item = new QListWidgetItem(audioIcon, i18n(namenode.text().toUtf8().data()), m_ui.effectlist);
             } else if ("custom" == type) {
-                item = new QListWidgetItem(customIcon, i18n(namenode.toElement().text().toUtf8().data()), m_ui.effectlist);
+                item = new QListWidgetItem(customIcon, i18n(namenode.text().toUtf8().data()), m_ui.effectlist);
             } else {
-                item = new QListWidgetItem(videoIcon, i18n(namenode.toElement().text().toUtf8().data()), m_ui.effectlist);
+                item = new QListWidgetItem(videoIcon, i18n(namenode.text().toUtf8().data()), m_ui.effectlist);
             }
             item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
             if (d.attribute("disable") == "1")

diff --git a/src/initeffects.cpp b/src/initeffects.cpp
index 070c791561b0299ade2bf6af19949b3821a59247..cb42a3db144bb743f124624b9925747bda23d884 100644 (file)
--- a/src/initeffects.cpp
+++ b/src/initeffects.cpp
@@ -216,7 +216,7 @@ Mlt::Repository *initEffects::parseEffectFiles()
     // Create transitions
     for (int i = 0; i < MainWindow::transitions.count(); ++i) {
         effectInfo = MainWindow::transitions.at(i);
-        effectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo);
+        effectsMap.insert(effectInfo.firstChildElement("name").text().toLower().toUtf8().data(), effectInfo);
     }
     MainWindow::transitions.clearList();
     foreach(const QDomElement & effect, effectsMap)
@@ -230,16 +230,16 @@ Mlt::Repository *initEffects::parseEffectFiles()
         if (!doc.isNull() && doc.elementsByTagName("parameter").count() > 0) {
             if (doc.documentElement().attribute("type") == "audio") {
                 if (doc.elementsByTagName("description").count() > 0) {
-                    QString desc = doc.documentElement().elementsByTagName("description").item(0).toElement().text();
+                    QString desc = doc.documentElement().firstChildElement("description").text();
                     //WARNING: TEMPORARY FIX for unusable MLT SOX parameters description
                     if (desc.startsWith("Process audio using a SoX")) {
                         // Remove MLT's SOX generated effects since the parameters properties are unusable for us
                     }
-                    else audioEffectsMap.insert(doc.documentElement().elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), doc.documentElement());
+                    else audioEffectsMap.insert(doc.documentElement().firstChildElement("name").text().toLower().toUtf8().data(), doc.documentElement());
                 }
             }
             else
-                videoEffectsMap.insert(doc.documentElement().elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), doc.documentElement());
+                videoEffectsMap.insert(doc.documentElement().firstChildElement("name").text().toLower().toUtf8().data(), doc.documentElement());
         }
     }
 
@@ -263,7 +263,7 @@ Mlt::Repository *initEffects::parseEffectFiles()
     // Create custom effects
     for (int i = 0; i < MainWindow::customEffects.count(); ++i) {
         effectInfo = MainWindow::customEffects.at(i);
-        effectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo);
+        effectsMap.insert(effectInfo.firstChildElement("name").text().toLower().toUtf8().data(), effectInfo);
     }
     MainWindow::customEffects.clearList();
     foreach(const QDomElement & effect, effectsMap)
@@ -273,7 +273,7 @@ Mlt::Repository *initEffects::parseEffectFiles()
     // Create audio effects
     for (int i = 0; i < MainWindow::audioEffects.count(); ++i) {
         effectInfo = MainWindow::audioEffects.at(i);
-        audioEffectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo);
+        audioEffectsMap.insert(effectInfo.firstChildElement("name").text().toLower().toUtf8().data(), effectInfo);
     }
     MainWindow::audioEffects.clearList();
     foreach(const QDomElement & effect, audioEffectsMap)
@@ -282,7 +282,7 @@ Mlt::Repository *initEffects::parseEffectFiles()
     // Create video effects
     for (int i = 0; i < MainWindow::videoEffects.count(); ++i) {
         effectInfo = MainWindow::videoEffects.at(i);
-        videoEffectsMap.insert(effectInfo.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), effectInfo);
+        videoEffectsMap.insert(effectInfo.firstChildElement("name").text().toLower().toUtf8().data(), effectInfo);
     }
     MainWindow::videoEffects.clearList();
     foreach(const QDomElement & effect, videoEffectsMap)
@@ -323,7 +323,7 @@ void initEffects::parseCustomEffectsFile()
             kDebug() << "More than one effect in file " << itemName << ", not supported yet";
         } else {
             e = effects.item(0).toElement();
-            effectsMap.insert(e.elementsByTagName("name").item(0).toElement().text().toLower().toUtf8().data(), e);
+            effectsMap.insert(e.firstChildElement("name").text().toLower().toUtf8().data(), e);
         }
     }
     foreach(const QDomElement & effect, effectsMap)
@@ -406,76 +406,6 @@ void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *au
             else
                 videoEffectList->append(documentElement);
         }
-
-        /*
-             QDomNode n = documentElement.firstChild();
-         QString id, effectName, effectTag, paramType;
-         int paramCount = 0;
-         EFFECTTYPE type;
-
-                // Create Effect
-                EffectParamDescFactory effectDescParamFactory;
-                EffectDesc *effect = NULL;
-
-         // parse effect file
-         QDomNode namenode = documentElement.elementsByTagName("name").item(0);
-         if (!namenode.isNull()) effectName = i18n(namenode.toElement().text());
-         if (!groupName.isEmpty()) effectName.prepend("_" + groupName + "_");
-
-         QDomNode propsnode = documentElement.elementsByTagName("properties").item(0);
-         if (!propsnode.isNull()) {
-             QDomElement propselement = propsnode.toElement();
-             id = propselement.attribute("id", QString());
-             effectTag = propselement.attribute("tag", QString());
-             if (propselement.attribute("type", QString()) == "audio") type = AUDIOEFFECT;
-             else if (propselement.attribute("type", QString()) == "custom") type = CUSTOMEFFECT;
-             else type = VIDEOEFFECT;
-         }
-
-         QString effectDescription;
-         QDomNode descnode = documentElement.elementsByTagName("description").item(0);
-         if (!descnode.isNull()) effectDescription = descnode.toElement().text() + "<br />";
-
-         QString effectAuthor;
-         QDomNode authnode = documentElement.elementsByTagName("author").item(0);
-         if (!authnode.isNull()) effectAuthor = authnode.toElement().text() + "<br />";
-
-         if (effectName.isEmpty() || id.isEmpty() || effectTag.isEmpty()) return;
-
-         effect = new EffectDesc(effectName, id, effectTag, effectDescription, effectAuthor, type);
-
-         QDomNodeList paramList = documentElement.elementsByTagName("parameter");
-         if (paramList.count() == 0) {
-             QDomElement fixed = doc.createElement("parameter");
-             fixed.setAttribute("type", "fixed");
-             effect->addParameter(effectDescParamFactory.createParameter(fixed));
-         }
-         else for (int i = 0; i < paramList.count(); i++) {
-             QDomElement e = paramList.item(i).toElement();
-             if (!e.isNull()) {
-          paramCount++;
-           QDomNamedNodeMap attrs = e.attributes();
-          int i = 0;
-          QString value;
-          while (!attrs.item(i).isNull()) {
-              QDomNode n = attrs.item(i);
-              value = n.nodeValue();
-              if (value.find("MAX_WIDTH") != -1)
-           value.replace("MAX_WIDTH", QString::number(KdenliveSettings::defaultwidth()));
-              if (value.find("MID_WIDTH") != -1)
-           value.replace("MID_WIDTH", QString::number(KdenliveSettings::defaultwidth() / 2));
-              if (value.find("MAX_HEIGHT") != -1)
-           value.replace("MAX_HEIGHT", QString::number(KdenliveSettings::defaultheight()));
-              if (value.find("MID_HEIGHT") != -1)
-           value.replace("MID_HEIGHT", QString::number(KdenliveSettings::defaultheight() / 2));
-              n.setNodeValue(value);
-              i++;
-          }
-          effect->addParameter(effectDescParamFactory.createParameter(e));
-             }
-         }
-                effectList->append(effect);
-         }*/
     }
 }
 

diff --git a/src/moveeffectcommand.cpp b/src/moveeffectcommand.cpp
index cfbd76bfd77ac8443909033a724b15f9d664ab13..ba87dc3ddcb54ef9a25066f49376606a0f6de10d 100644 (file)
--- a/src/moveeffectcommand.cpp
+++ b/src/moveeffectcommand.cpp
@@ -32,8 +32,8 @@ MoveEffectCommand::MoveEffectCommand(CustomTrackView *view, const int track, Gen
         m_pos(pos)
 {
     /*    QString effectName;
-        QDomNode namenode = effect.elementsByTagName("name").item(0);
-        if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+        QDomElement namenode = effect.firstChildElement("name");
+        if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data());
         else effectName = i18n("effect");
         setText(i18n("Move effect %1", effectName));*/
     setText(i18n("Move effect"));

diff --git a/src/trackview.cpp b/src/trackview.cpp
index 1947f5dfa86c329392f525a01d1747647a58174e..1d2af8aef72e9ee5e86c9078141fddb74974cc0f 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -191,12 +191,6 @@ void TrackView::parseDocument(QDomDocument doc)
     m_documentErrors.clear();
     m_replacementProducerIds.clear();
 
-    //kDebug() << "//// DOCUMENT: " << doc.toString();
-    /*QDomNode props = doc.elementsByTagName("properties").item(0);
-    if (!props.isNull()) {
-        cursorPos = props.toElement().attribute("timeline_position").toInt();
-    }*/
-
     // parse project tracks
     QDomElement mlt = doc.firstChildElement("mlt");
     QDomElement tractor = mlt.firstChildElement("tractor");

diff --git a/src/transition.cpp b/src/transition.cpp
index eefa77bfed643e4c8bdc525deb4d71ff3229185d..01b80412013bd0e5d643a95e29b63832fb8149e5 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -70,7 +70,7 @@ Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDo
     if (m_automaticTransition) m_parameters.setAttribute("automatic", 1);
     else if (m_parameters.attribute("automatic") == "1") m_automaticTransition = true;
     if (m_parameters.attribute("force_track") == "1") m_forceTransitionTrack = true;
-    m_name = i18n(m_parameters.elementsByTagName("name").item(0).toElement().text().toUtf8().data());
+    m_name = i18n(m_parameters.firstChildElement("name").text().toUtf8().data());
     m_secondClip = 0;
 
     //m_referenceClip->addTransition(this);
@@ -127,7 +127,7 @@ void Transition::setTransitionParameters(const QDomElement params)
     m_parameters = params;
     if (m_parameters.attribute("force_track") == "1") setForcedTrack(true, m_parameters.attribute("transition_btrack").toInt());
     else if (m_parameters.attribute("force_track") == "0") setForcedTrack(false, m_parameters.attribute("transition_btrack").toInt());
-    m_name = i18n(m_parameters.elementsByTagName("name").item(0).toElement().text().toUtf8().data());
+    m_name = i18n(m_parameters.firstChildElement("name").text().toUtf8().data());
     update();
 }