From 8b222e18e56f33b489e6d4e5d80ac6d23df5ce09 Mon Sep 17 00:00:00 2001
From: Till Theato <root@ttill.de>
Date: Fri, 1 Jul 2011 09:22:44 +0000
Subject: [PATCH] Remove some unused but translatable strings

svn path=/trunk/kdenlive/; revision=5754
---
 effects/frei0r_bezier_curves.xml |  4 +---
 effects/frei0r_curves.xml        |  4 +---
 effects/rotoscoping.xml          |  4 +---
 src/effectstackedit.cpp          | 14 +++++++-------
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/effects/frei0r_bezier_curves.xml b/effects/frei0r_bezier_curves.xml
index 10dcb6e1..61374e9d 100644
--- a/effects/frei0r_bezier_curves.xml
+++ b/effects/frei0r_bezier_curves.xml
@@ -14,7 +14,5 @@
                 <name>Luma formula</name>
         </parameter>
 
-        <parameter type="bezier_spline" name="Bézier spline" depends="Channel" default="-1;-1#0;0#0.1;0.1|0.9;0.9#1;1#2;2">
-                <name>Bézier Spline Widget</name>
-        </parameter>
+        <parameter type="bezier_spline" name="Bézier spline" depends="Channel" default="-1;-1#0;0#0.1;0.1|0.9;0.9#1;1#2;2" />
 </effect>
diff --git a/effects/frei0r_curves.xml b/effects/frei0r_curves.xml
index 2dd36349..690691d9 100644
--- a/effects/frei0r_curves.xml
+++ b/effects/frei0r_curves.xml
@@ -13,9 +13,7 @@
         </parameter>
         
         <!-- No actual parameter: Represents the curve widget -->
-        <parameter type="curve" default="0" depends="Channel" number="Curve point number" inpoints="Point %i input value" outpoints="Point %i output value" min="1" max="5">
-                <name>Curve Widget</name>
-        </parameter>
+        <parameter type="curve" default="0" depends="Channel" number="Curve point number" inpoints="Point %i input value" outpoints="Point %i output value" min="1" max="5" />
 
 	<parameter type="fixed" name="Curve point number" default="2" min="2" max="5">
 		<name>Number of curve points</name>
diff --git a/effects/rotoscoping.xml b/effects/rotoscoping.xml
index 908ea877..6e565938 100644
--- a/effects/rotoscoping.xml
+++ b/effects/rotoscoping.xml
@@ -30,7 +30,5 @@
             <name>Feathering passes</name>
         </parameter>
 
-        <parameter type="roto-spline" name="spline" default="">
-            <name>Rotoscopy Spline</name>
-        </parameter>
+        <parameter type="roto-spline" name="spline" default="" />
 </effect>
diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index 6a9ab4dd..a2d2b5ff 100644
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -122,9 +122,9 @@ void EffectStackEdit::setFrameSize(QPoint p)
     QDomNodeList namenode = m_params.elementsByTagName("parameter");
     for (int i = 0; i < namenode.count() ; i++) {
         QDomNode pa = namenode.item(i);
-        QDomNode na = pa.firstChildElement("name");
+        QDomElement na = pa.firstChildElement("name");
         QString type = pa.attributes().namedItem("type").nodeValue();
-        QString paramName = i18n(na.toElement().text().toUtf8().data());
+        QString paramName = na.isNull() ? pa.attributes().namedItem("name").nodeValue() : i18n(na.text().toUtf8().data());
 
         if (type == "geometry") {
             if (!KdenliveSettings::on_monitor_effects()) {
@@ -148,9 +148,9 @@ void EffectStackEdit::updateTimecodeFormat()
     QDomNodeList namenode = m_params.elementsByTagName("parameter");
     for (int i = 0; i < namenode.count() ; i++) {
         QDomNode pa = namenode.item(i);
-        QDomNode na = pa.firstChildElement("name");
+        QDomElement na = pa.firstChildElement("name");
         QString type = pa.attributes().namedItem("type").nodeValue();
-        QString paramName = i18n(na.toElement().text().toUtf8().data());
+        QString paramName = na.isNull() ? pa.attributes().namedItem("name").nodeValue() : i18n(na.text().toUtf8().data());
 
         if (type == "geometry") {
             if (KdenliveSettings::on_monitor_effects()) {
@@ -247,7 +247,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, ItemInfo info, bool
         QDomElement na = pa.firstChildElement("name");
         QDomElement commentElem = pa.firstChildElement("comment");
         QString type = pa.attribute("type");
-        QString paramName = i18n(na.text().toUtf8().data());
+        QString paramName = na.isNull() ? pa.attribute("name") : i18n(na.text().toUtf8().data());
         QString comment;
         if (!commentElem.isNull())
             comment = i18n(commentElem.text().toUtf8().data());
@@ -642,9 +642,9 @@ void EffectStackEdit::collectAllParameters()
 
     for (int i = 0; i < namenode.count() ; i++) {
         QDomNode pa = namenode.item(i);
-        QDomNode na = pa.firstChildElement("name");
+        QDomElement na = pa.firstChildElement("name");
         QString type = pa.attributes().namedItem("type").nodeValue();
-        QString paramName = i18n(na.toElement().text().toUtf8().data());
+        QString paramName = na.isNull() ? pa.attributes().namedItem("name").nodeValue() : i18n(na.text().toUtf8().data());
         if (type == "complex")
             paramName.append("complex");
         else if (type == "position")
-- 
2.39.2