Sort cli options in --help output

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

diff --git a/src/common/cliparser.h b/src/common/cliparser.h
index 3b0af91..761eb0d 100644 (file)
--- a/src/common/cliparser.h
+++ b/src/common/cliparser.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,55 +21,30 @@
 #ifndef CLIPARSER_H
 #define CLIPARSER_H
 
-#include <QString>
-#include <QStringList>
-#include <QHash>
+#include <QMap>
 
-class CliParser{
+#include "abstractcliparser.h"
+
+//! Quassel's own parser for command line arguments
+class CliParser : public AbstractCliParser {
 public:
-  inline CliParser() {};
-  CliParser(QStringList arguments);
+  CliParser();
+
+  bool init(const QStringList &arguments = QStringList());
 
-  bool parse();
   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(CliParserArg::CliArgSwitch, longName, shortName, help);
-  }
-  inline void addOption(const QString longName, const char shortName = 0, const QString help = QString(), const QString def = QString()) {
-    addArgument(CliParserArg::CliArgOption, longName, 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 CliParserArg::CliArgType type, const QString longName, const char shortName = 0, const QString help = QString(), const QString def = QString());
-  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());
+  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;
+  QMap<QString, CliParserArg> argsMap;
 };
 
 #endif