#
#
# patch "src/GuitoneDriver.cpp"
#  from [d4441384aad7e8e44484f8a4b22c9744887ac7ea]
#    to [65f257718ae2d0a79947d69043972a79ac34985a]
# 
# patch "src/GuitoneDriver.h"
#  from [d962e050f1f766c04a0be38f979065ab04b25d02]
#    to [b24931e08bf618708c41b9b55d6878de024f3f33]
#
============================================================
--- src/GuitoneDriver.cpp	d4441384aad7e8e44484f8a4b22c9744887ac7ea
+++ src/GuitoneDriver.cpp	65f257718ae2d0a79947d69043972a79ac34985a
@@ -23,6 +23,8 @@
 #include "DatabaseDialogManager.h"
 #include "WorkspaceDialogManager.h"
 
+#include <QGenericArgument>
+
 GuitoneDriver::GuitoneDriver(int & argc, char** argv)
   : GuitoneCore(argc, argv), dialogManager(0)
 {
@@ -150,19 +152,19 @@ void GuitoneDriver::processCommands()
     QGenericArgument genArgs[10];
     for (int i=0; i<methodArgs.size(); i++)
     {
-        const char * value  = args.at(i).toLatin1().constData();
+        const char * typeName = methodArgs.at(i).constData();
+        QVariant::Type type = QVariant::nameToType(typeName);
 
-        QVariant::Type type = QVariant::nameToType(methodArgs.at(i).constData());
-        // we currently only use strings
+        // we currently only use / support strings
         switch (type)
         {
-            case QVariant::String:      genArgs[i] = Q_ARG(QString, value); break;
+            case QVariant::String:      genArgs[i] = Q_ARG(QString, args.at(i)); break;
             case QVariant::Invalid:     I(false);
-            default: error(QString("unrecognized type %1").arg(type)); return;
+            default: error(QString("unrecognized type %1").arg(typeName)); return;
         }
     }
 
-    const char * methodName = CSTR(reqMethod);
+    const char * methodName = static_cast<const char *>(reqMethod.toLatin1().data());
     QMetaObject::invokeMethod(dialogManager, methodName, Qt::DirectConnection,
                               genArgs[0], genArgs[1], genArgs[2], genArgs[3],
                               genArgs[4], genArgs[5], genArgs[6], genArgs[7],
@@ -172,7 +174,7 @@ void GuitoneDriver::error(const QString 
 void GuitoneDriver::error(const QString & msg)
 {
     C(msg);
-    //QMessageBox::critical(NULL, tr("Error"), msg, QMessageBox::Ok, 0, 0);
+    QMessageBox::critical(NULL, tr("Error"), msg, QMessageBox::Ok, 0, 0);
     quit();
 }
 
============================================================
--- src/GuitoneDriver.h	d962e050f1f766c04a0be38f979065ab04b25d02
+++ src/GuitoneDriver.h	b24931e08bf618708c41b9b55d6878de024f3f33
@@ -24,8 +24,6 @@
 #include "GuitoneCore.h"
 #include "DialogManager.h"
 
-#define CSTR(arg) static_cast<const char *>(arg.toLatin1().data())
-
 class GuitoneDriver : public GuitoneCore
 {
     Q_OBJECT