Reworking CliParser to allow building quasselcore always without KDE deps

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

diff --git a/src/common/cliparser.h b/src/common/cliparser.h
index 8515d55..3c096a2 100644 (file)
--- a/src/common/cliparser.h
+++ b/src/common/cliparser.h
@@ -21,15 +21,12 @@
 #ifndef CLIPARSER_H
 #define CLIPARSER_H
 
-#include <QString>
-#include <QStringList>
 #include <QHash>
 
-#ifdef HAVE_KDE
-#  include <KCmdLineOptions>
-#endif
+#include "abstractcliparser.h"
 
-class CliParser {
+//! Quassel's own parser for command line arguments
+class CliParser : public AbstractCliParser {
 public:
   CliParser();
 
@@ -37,40 +34,10 @@ public:
 
   QString value(const QString &longName);
   bool isSet(const QString &longName);
-  inline void addSwitch(const QString &longName, const char shortName = 0, const QString &help = QString()) {
-    addArgument(longName, CliParserArg(CliParserArg::CliArgSwitch, shortName, help));
-  }
-  inline void addOption(const QString &longName, const char shortName = 0, const QString &help = QString(), const QString &def = QString()) {
-    addArgument(longName, CliParserArg(CliParserArg::CliArgOption, shortName, help, def));
-  }
   void usage();
 
 private:
-  struct CliParserArg {
-    enum CliArgType {
-      CliArgInvalid,
-      CliArgSwitch,
-      CliArgOption
-    };
-    CliParserArg(const CliArgType _type = CliArgInvalid, const char _shortName = 0, const QString _help = QString(), const QString _def = QString())
-    : type(_type),
-    shortName(_shortName),
-    help(_help),
-    def(_def),
-    value(QString()),
-    boolValue(false) {};
-
-    CliArgType type;
-    char shortName;
-    QString help;
-    QString def;
-    QString value;
-    bool boolValue;
-  };
-
   void addArgument(const QString &longName, const CliParserArg &arg);
-
-#ifndef HAVE_KDE
   bool addLongArg(const CliParserArg::CliArgType type, const QString &name, const QString &value = QString());
   bool addShortArg(const CliParserArg::CliArgType type, const char shortName, const QString &value = QString());
   QString escapedValue(const QString &value);
@@ -78,10 +45,6 @@ private:
 
   QStringList argsRaw;
   QHash<QString, CliParserArg> argsHash;
-
-#else
-  KCmdLineOptions _cmdLineOptions;
-#endif
 };
 
 #endif