Cleanup + fix i18n with args

svn path=/branches/KDE4/; revision=2005

diff --git a/src/addeffectcommand.cpp b/src/addeffectcommand.cpp
index 48a234dcd6d98718a72f7571e96fb11c81c86653..1f8fac4ef43b3cf3965a68deccd6f053b8fd3231 100644 (file)
--- a/src/addeffectcommand.cpp
+++ b/src/addeffectcommand.cpp
@@ -23,8 +23,12 @@
 
 AddEffectCommand::AddEffectCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement effect, bool doIt)
         : m_view(view), m_track(track), m_pos(pos), m_effect(effect), m_doIt(doIt) {
-    if (doIt) setText(i18n("Add effect"));
-    else setText(i18n("Delete effect"));
+    QString effectName;
+    QDomNode namenode = effect.elementsByTagName("name").item(0);
+    if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+    else effectName = i18n("effect");
+    if (doIt) setText(i18n("Add %1", effectName));
+    else setText(i18n("Delete %1", effectName));
 }
 
 

diff --git a/src/editeffectcommand.cpp b/src/editeffectcommand.cpp
index 7359614b04124ff0c2393830a2b59b646f903701..679cf75bfa3ed4aa5f3ddb889fc54294ab4ef0f6 100644 (file)
--- a/src/editeffectcommand.cpp
+++ b/src/editeffectcommand.cpp
@@ -24,7 +24,11 @@
 EditEffectCommand::EditEffectCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement oldeffect, QDomElement effect, bool doIt)
         : m_view(view), m_track(track), m_pos(pos), m_oldeffect(oldeffect), m_doIt(doIt) {
     m_effect = effect.cloneNode().toElement();
-    setText(i18n("Edit effect"));
+    QString effectName;
+    QDomNode namenode = effect.elementsByTagName("name").item(0);
+    if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+    else effectName = i18n("effect");
+    setText(i18n("Edit effect %1", effectName));
 }
 
 // virtual

diff --git a/src/effectslist.cpp b/src/effectslist.cpp
index 9d309955a382cc14d31a3815ac67d44ac7dc8b49..f17de756e8eeb6aee784a09e68b430dab85aa4ca 100644 (file)
--- a/src/effectslist.cpp
+++ b/src/effectslist.cpp
@@ -36,7 +36,7 @@ QMap <QString, QString> EffectsList::effect(const QString & name) {
         effect =  this->at(i);
         QDomNode namenode = effect.elementsByTagName("name").item(0);
         if (!namenode.isNull()) {
-            effectName = i18n(qstrdup(namenode.toElement().text().toUtf8()));
+            effectName = i18n(namenode.toElement().text().toUtf8().data());
             if (name == effectName) break;
         }
     }
@@ -50,7 +50,7 @@ QDomElement EffectsList::getEffectByName(const QString & name) {
     for (int i = 0; i < this->size(); ++i) {
         QDomElement effect =  this->at(i);
         QDomNode namenode = effect.elementsByTagName("name").item(0);
-        if (!namenode.isNull()) effectName = i18n(qstrdup(namenode.toElement().text().toUtf8()));
+        if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
         if (name == effectName) {
             QDomNodeList params = effect.elementsByTagName("parameter");
             for (int i = 0; i < params.count(); i++) {
@@ -69,7 +69,7 @@ QStringList EffectsList::effectNames() {
     for (int i = 0; i < this->size(); ++i) {
         QDomElement effect =  this->at(i);
         QDomNode namenode = effect.elementsByTagName("name").item(0);
-        if (!namenode.isNull()) list.append(i18n(qstrdup(namenode.toElement().text().toUtf8())));
+        if (!namenode.isNull()) list.append(i18n(namenode.toElement().text().toUtf8().data()));
     }
     return list;
 }
@@ -78,9 +78,9 @@ QString EffectsList::getInfo(QString effectName) {
     QString info;
     QDomElement effect = getEffectByName(effectName);
     QDomNode namenode = effect.elementsByTagName("description").item(0);
-    if (!namenode.isNull()) info = i18n(qstrdup(namenode.toElement().text().toUtf8()));
+    if (!namenode.isNull()) info = i18n(namenode.toElement().text().toUtf8().data());
     namenode = effect.elementsByTagName("author").item(0);
-    if (!namenode.isNull()) info.append(i18n("<br><b>Author:</b> ") + i18n(qstrdup(namenode.toElement().text().toUtf8())));
+    if (!namenode.isNull()) info.append(i18n("<br><b>Author:</b> ") + i18n(namenode.toElement().text().toUtf8().data()));
     return info;
 }
 

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 0e6a04afc28f6eae9a429fb090766e293ab4cd35..d5e8c8945d575cf81decce040c04ad5047f56bb6 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -181,7 +181,7 @@ void ProjectList::slotRemoveClip() {
     if (!listView->currentItem()) return;
     ProjectItem *item = ((ProjectItem *)listView->currentItem());
     if (item->numReferences() > 0) {
-        if (KMessageBox::questionYesNo(this, i18n("Delete clip <b>%1</b> ?<br>This will also remove its %2 clips in timeline").arg(item->names().at(1)).arg(item->numReferences()), i18n("Delete Clip")) != KMessageBox::Yes) return;
+        if (KMessageBox::questionYesNo(this, i18n("Delete clip <b>%1</b> ?<br>This will also remove its %2 clips in timeline", item->names().at(1), item->numReferences()), i18n("Delete Clip")) != KMessageBox::Yes) return;
     }
     m_doc->deleteProjectClip(item->clipId());
 }