X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fcliparser.h;h=0cdfcaf1a106cc9eb20b8849ef74479ba572d6f9;hp=00f22b982bad297e3d7e5bf40e32f5a6b14aa920;hb=b2efa6809ee09b70be19c0f66e0fcd6e57bf64bc;hpb=b3a2bd9e7d829afca26c6ab3ea09dfc6490319ce

diff --git a/src/common/cliparser.h b/src/common/cliparser.h
index 00f22b98..0cdfcaf1 100644
--- a/src/common/cliparser.h
+++ b/src/common/cliparser.h
@@ -24,47 +24,53 @@
 #include <QString>
 #include <QStringList>
 #include <QHash>
-#include <QVariant>
-
-class CliParserArg {
-public:
-  enum CliArgType {
-    CliArgInvalid,
-    CliArgSwitch,
-    CliArgOption
-  };
-  typedef CliArgType CliArgTypes;
-  
-  inline CliParserArg() {};
-  CliParserArg(const CliParserArg &other);
-  CliParserArg(CliArgType type, QString longName, char shortName = 0, QVariant _def = QVariant());
-  CliParserArg &operator=(const CliParserArg &other);
-
-  CliArgType type;
-  QString lname;
-  char sname;
-  QString shortHelp;
-  QVariant def;
-  QVariant value;
-};
-Q_DECLARE_METATYPE(CliParserArg);
 
 class CliParser{
 public:
   inline CliParser() {};
-  CliParser(QStringList arguments);
-  bool parse();
-  QVariant value(QString key);
-  void addSwitch(QString longName, char shortName = 0, QVariant def = false);
-  void addOption(QString longName, char shortName = 0, QVariant def = QVariant());
-  void addHelp(QString key, QString txt);
+
+  bool parse(const QStringList &arguments);
+  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:
-  void addArgument(CliParserArg::CliArgType type, QString longName, char shortName, QVariant def);
+  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);
+  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, CliParserArg> argsHash;
-  QHash<const char, QHash<QString, CliParserArg>::iterator> shortHash;
 };
 
-
 #endif