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 6872f77..3c096a2 100644 (file)
--- a/src/common/cliparser.h
+++ b/src/common/cliparser.h
@@ -21,41 +21,30 @@
 #ifndef CLIPARSER_H
 #define CLIPARSER_H
 
-#include <QString>
-#include <QStringList>
 #include <QHash>
-#include <QVariant>
 
-class CliParserArg;
+#include "abstractcliparser.h"
 
-class CliParser{
+//! Quassel's own parser for command line arguments
+class CliParser : public AbstractCliParser {
 public:
-    inline CliParser() {};
-    CliParser(int argc, char *argv[]);
+  CliParser();
+
+  bool init(const QStringList &arguments = QStringList());
+
+  QString value(const QString &longName);
+  bool isSet(const QString &longName);
+  void usage();
 
-    ~CliParser();
-    bool parse();
-    QVariant value(QString key);
-    void addArgument(QString longName, char shortName, QVariant def);
 private:
+  void addArgument(const QString &longName, const CliParserArg &arg);
+  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);
+  QString lnameOfShortArg(const char arg);
+
   QStringList argsRaw;
-  QHash<QString, QVariant*> savedValues;
   QHash<QString, CliParserArg> argsHash;
-  QHash<QString, QHash<QString, CliParserArg>::iterator> shortHash;
-};
-
-class CliParserArg {
-public:
-  inline CliParserArg() {};
-  CliParserArg(const CliParserArg &other);
-  CliParserArg(QString longName, char shortName, QVariant _def);
-  CliParserArg &operator=(const CliParserArg &other);
-// private:
-  QString lname;
-  char sname;
-  QVariant def;
-  QVariant value;
 };
-Q_DECLARE_METATYPE(CliParserArg);
 
 #endif