Reworking CliParser to allow building quasselcore always without KDE deps

[quassel.git] / src / common / cliparser.cpp

diff --git a/src/common/cliparser.cpp b/src/common/cliparser.cpp
index a34af80..625f64a 100644 (file)
--- a/src/common/cliparser.cpp
+++ b/src/common/cliparser.cpp
@@ -20,11 +20,17 @@
 #include "cliparser.h"
 
 #include <QDir>
+#include <QDebug>
 #include <QString>
 #include <QFileInfo>
-#include <QDebug>
 
-void CliParser::addArgument(const QString &longName, const CliParserArg &arg) {
+CliParser::CliParser() : AbstractCliParser() {
+
+}
+
+void CliParser::addArgument(const QString &longName_, const CliParserArg &arg) {
+  QString longName = longName_;
+  longName.remove(QRegExp("\\s*<.*>\\s*")); // KCmdLineArgs takes args of the form "arg <defval>"
   if(argsHash.contains(longName)) qWarning() << "Warning: Multiple definition of argument" << longName;
   if(arg.shortName != 0 && !lnameOfShortArg(arg.shortName).isNull())
     qWarning().nospace() << "Warning: Redefining shortName '" << arg.shortName << "' for " << longName << " previously defined for " << lnameOfShortArg(arg.shortName);
@@ -77,7 +83,7 @@ QString CliParser::escapedValue(const QString &value) {
   return escapedValue;
 }
 
-bool CliParser::parse(const QStringList &args) {
+bool CliParser::init(const QStringList &args) {
   argsRaw = args;
   QStringList::const_iterator currentArg;
   for (currentArg = argsRaw.constBegin(); currentArg != argsRaw.constEnd(); ++currentArg) {
@@ -178,7 +184,7 @@ void CliParser::usage() {
     if(arg.value().type == CliParserArg::CliArgOption && !arg.value().def.isNull()) {
       output.append(". Default is: ").append(arg.value().def);
     }
-    qWarning(output.toLatin1());
+    qWarning() << output.toLatin1();
   }
 }