kdewebdev/quanta/utility

[Andras Mantia]

CVS commit by amantia: 

Don't break one event action argument into many, like "Before upload" to "before" and "upload" after %userarguments is replaced in script actions.
Without this you cannot really write script actions that handle events, as the event names were broken up in pieces, so the real arguments were not at fixed positions. Not talking about the fact that the event names are translated.
Shortly: this fix is needed to have a correct functionality and I would like to backport for 3.4.0.

May I do it?

CCMAIL: kde-core-devel at kde.org


  M +1 -0      qpevents.cpp   1.24
  M +10 -9     tagaction.cpp   1.121


--- kdewebdev/quanta/utility/qpevents.cpp  #1.23:1.24
@@ -25,4 +25,5 @@
 #include <klocale.h>
 #include <kmessagebox.h>
+#include <kprocess.h>
 
 //app includes

--- kdewebdev/quanta/utility/tagaction.cpp  #1.120:1.121
@@ -280,16 +280,17 @@ bool TagAction::insertTag(bool inputFrom
           args.replace("%projectbase", s);
       }
-      pos = args.find("%userarguments");
-      if (pos != -1)
+      QStringList argsList1 = QStringList::split(' ', args);
+      QStringList argsList;
+      for (uint i = 0; i < argsList1.count(); i++)
       {
-        QString s;
-        /*for (uint i = 0; i <m_argsList.count(); i++)
+        if (argsList1[i] == "%userarguments")
         {
-          s += "\""+m_argsList[i]+"\" ";
-      }*/
-        s = m_argsList.join(" ");
-        args.replace("%userarguments", s);
+          for (uint j = 0; j < m_argsList.count(); j++)
+          {
+            argsList.append(m_argsList[j]);
+          }      
+        } else
+          argsList.append(argsList1[i]);
       }
-      QStringList argsList = QStringList::split(' ', args);
       m_argsList.clear();
       *proc << argsList;