From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Sat, 30 Jul 2011 09:43:07 +0000 (+0000)
Subject: cleanup: Get rid of unnecessary string to int conversions
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8063c72c964682667335a090d1a28653e7416f62;p=kdenlive

cleanup: Get rid of unnecessary string to int conversions

svn path=/trunk/kdenlive/; revision=5811
---

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 2378a79d..0f7d88a8 100644
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -1589,7 +1589,7 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip)
 {
     int track = m_document->tracksCount() - clip->track();
     GenTime pos = clip->startPos();
-    if (!m_document->renderer()->mltRemoveEffect(track, pos, "-1", false, false)) {
+    if (!m_document->renderer()->mltRemoveEffect(track, pos, -1, false, false)) {
         emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
         return;
     }
@@ -1641,7 +1641,7 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect)
     QString index = effect.attribute("kdenlive_ix");
     if (pos < GenTime()) {
         // Delete track effect
-        if (m_document->renderer()->mltRemoveTrackEffect(track, index, true)) {
+        if (m_document->renderer()->mltRemoveTrackEffect(track, index.toInt(), true)) {
 	    m_document->removeTrackEffect(track - 1, effect);
 	}
 	else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
@@ -1656,11 +1656,11 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect)
             doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId());
             clip->deleteEffect(index);
             emit clipItemSelected(clip);
-            m_document->renderer()->mltRemoveEffect(track, pos, index, true);
+            m_document->renderer()->mltRemoveEffect(track, pos, index.toInt(), true);
             return;
         }
     }
-    if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true)) {
+    if (!m_document->renderer()->mltRemoveEffect(track, pos, index.toInt(), true)) {
         kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disable");
         emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
         return;
diff --git a/src/renderer.cpp b/src/renderer.cpp
index 5a859b9a..15d8e52c 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -2291,7 +2291,7 @@ int Render::mltChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, dou
     return newLength;
 }
 
-bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex)
+bool Render::mltRemoveTrackEffect(int track, int index, bool updateIndex)
 {
     Mlt::Service service(m_mltProducer->parent().get_service());
     bool success = false;
@@ -2305,11 +2305,11 @@ bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex)
     int ct = 0;
     Mlt::Filter *filter = clipService.filter(ct);
     while (filter) {
-        if ((index == "-1" && strcmp(filter->get("kdenlive_id"), ""))  || filter->get_int("kdenlive_ix") == index.toInt()) {
+        if ((index == -1 && strcmp(filter->get("kdenlive_id"), ""))  || filter->get_int("kdenlive_ix") == index) {
             if (clipService.detach(*filter) == 0) success = true;
         } else if (updateIndex) {
             // Adjust the other effects index
-            if (filter->get_int("kdenlive_ix") > index.toInt()) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1);
+            if (filter->get_int("kdenlive_ix") > index) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1);
             ct++;
         } else ct++;
         filter = clipService.filter(ct);
@@ -2320,7 +2320,7 @@ bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex)
     return success;
 }
 
-bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh)
+bool Render::mltRemoveEffect(int track, GenTime position, int index, bool updateIndex, bool doRefresh)
 {
     if (position < GenTime()) {
         // Remove track effect
@@ -2354,12 +2354,12 @@ bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool up
     int ct = 0;
     Mlt::Filter *filter = clipService.filter(ct);
     while (filter) {
-        if ((index == "-1" && strcmp(filter->get("kdenlive_id"), ""))  || filter->get_int("kdenlive_ix") == index.toInt()) {// && filter->get("kdenlive_id") == id) {
+        if ((index == -1 && strcmp(filter->get("kdenlive_id"), ""))  || filter->get_int("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) {
             if (clipService.detach(*filter) == 0) success = true;
             //kDebug()<<"Deleted filter id:"<<filter->get("kdenlive_id")<<", ix:"<<filter->get("kdenlive_ix")<<", SERVICE:"<<filter->get("mlt_service");
         } else if (updateIndex) {
             // Adjust the other effects index
-            if (filter->get_int("kdenlive_ix") > index.toInt()) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1);
+            if (filter->get_int("kdenlive_ix") > index) filter->set("kdenlive_ix", filter->get_int("kdenlive_ix") - 1);
             ct++;
         } else ct++;
         filter = clipService.filter(ct);
@@ -2636,7 +2636,7 @@ bool Render::mltEditTrackEffect(int track, EffectsParameterList params)
 
 bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params)
 {
-    QString index = params.paramValue("kdenlive_ix");
+    int index = params.paramValue("kdenlive_ix").toInt();
     QString tag =  params.paramValue("tag");
 
     if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle" || params.hasParam("region")) {
@@ -2677,7 +2677,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
 
     Mlt::Filter *filter = clip->filter(ct);
     while (filter) {
-        if (filter->get_int("kdenlive_ix") == index.toInt()) {
+        if (filter->get_int("kdenlive_ix") == index) {
             break;
         }
         ct++;
diff --git a/src/renderer.h b/src/renderer.h
index 9749583b..7bd25b3f 100644
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -206,8 +206,8 @@ Q_OBJECT public:
     bool mltRemoveClip(int track, GenTime position);
 
     /** @brief Deletes an effect from a clip in MLT's playlist. */
-    bool mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh = true);
-    bool mltRemoveTrackEffect(int track, QString index, bool updateIndex);
+    bool mltRemoveEffect(int track, GenTime position, int index, bool updateIndex, bool doRefresh = true);
+    bool mltRemoveTrackEffect(int track, int index, bool updateIndex);
 
     /** @brief Adds an effect to a clip in MLT's playlist. */
     bool mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh = true);