X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.cpp;h=cffa2a52be08169945b063d557626a4f7999f1bc;hb=a7640ab08689fb80c17386868d9e161960a4ffd2;hp=5cc9453c66a9896497056d828ad9f8c7fb7c174e;hpb=6f206f85a9c002e4e8e5f80880750739a088ec52;p=kdenlive

diff --git a/src/trackview.cpp b/src/trackview.cpp
index 5cc9453c..cffa2a52 100644
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -399,7 +399,7 @@ void TrackView::parseDocument(const QDomDocument &doc)
                 kDebug() << "///// REMOVED INVALID TRANSITION: " << e.attribute("id");
                 tractor.removeChild(transitions.item(i));
                 --i;
-            } else if (m_trackview->canBePastedTo(transitionInfo, TRANSITIONWIDGET)) {
+            } else if (m_trackview->canBePastedTo(transitionInfo, TransitionWidget)) {
                 Transition *tr = new Transition(transitionInfo, a_track, m_doc->fps(), base, isAutomatic);
                 if (forceTrack) tr->setForcedTrack(true, a_track);
                 m_scene->addItem(tr);
@@ -648,7 +648,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, const Q
                     // Found correct producer
                     m_documentErrors.append(i18n("Replaced wrong clip producer %1 with %2", id, clip->getId()) + '\n');
                     QString prodId = clip->getId();
-                    if (clip->clipType() == PLAYLIST || clip->clipType() == AV || clip->clipType() == AUDIO) {
+                    if (clip->clipType() == Playlist || clip->clipType() == AV || clip->clipType() == Audio) {
                         // We need producer for the track
                         prodId.append('_' + QString::number(ix));
                     }
@@ -712,9 +712,9 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, const Q
                             producerXml.setAttribute("mlt_type", type);
                             producerXml.setAttribute("resource", resource);
                             producerXml.setAttribute("duration", length);
-                            if (service == "colour") producerXml.setAttribute("type", COLOR);
-                            else if (service == "qimage" || service == "pixbuf") producerXml.setAttribute("type", IMAGE);
-                            else if (service == "kdenlivetitle") producerXml.setAttribute("type", TEXT);
+                            if (service == "colour") producerXml.setAttribute("type", Color);
+                            else if (service == "qimage" || service == "pixbuf") producerXml.setAttribute("type", Image);
+                            else if (service == "kdenlivetitle") producerXml.setAttribute("type", Text);
                             else producerXml.setAttribute("type", AV);
                             clip = new DocClipBase(m_doc->clipManager(), doc.documentElement(), id);
                             m_doc->clipManager()->addClip(clip);
@@ -854,8 +854,8 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo
                 // add first keyframe
                 if (effectout <= effectin) {
                     // there is only one keyframe
-                    keyframes.append(QString::number(effectin) + ':' + locale.toString(startvalue) + ';');
-                } else keyframes.append(QString::number(effectin) + ':' + locale.toString(startvalue) + ';' + QString::number(effectout) + ':' + QString::number(endvalue) + ';');
+                    keyframes.append(QString::number(effectin) + '=' + locale.toString(startvalue) + ';');
+                } else keyframes.append(QString::number(effectin) + '=' + locale.toString(startvalue) + ';' + QString::number(effectout) + '=' + QString::number(endvalue) + ';');
                 QDomNode lastParsedEffect;
                 ix++;
                 QDomNode n2 = effects.at(ix);
@@ -880,7 +880,7 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo
                         }
                     }
                     if (continueParsing) {
-                        keyframes.append(QString::number(effectout) + ':' + locale.toString(endvalue) + ';');
+                        keyframes.append(QString::number(effectout) + '=' + locale.toString(endvalue) + ';');
                         ix++;
                     }
                 }
@@ -981,7 +981,7 @@ void TrackView::adjustparameterValue(QDomNodeList clipeffectparams, const QStrin
                     QString fr = kfrs.at(l).section('=', 0, 0);
                     double val = locale.toDouble(kfrs.at(l).section('=', 1, 1));
                     //kfrs[l] = fr + ":" + locale.toString((int)(val * fact));
-                    kfrs[l] = fr + ':' + QString::number((int) (offset + val * fact));
+                    kfrs[l] = fr + '=' + QString::number((int) (offset + val * fact));
                 }
                 e.setAttribute("keyframes", kfrs.join(";"));
             } else if (type == "double" || type == "constant") {