introducing query merging (per drag & drop). needs a core update

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

diff --git a/src/common/cliparser.h b/src/common/cliparser.h
index 3b0af91..8515d55 100644 (file)
--- a/src/common/cliparser.h
+++ b/src/common/cliparser.h
@@ -25,19 +25,23 @@
 #include <QStringList>
 #include <QHash>
 
-class CliParser{
+#ifdef HAVE_KDE
+#  include <KCmdLineOptions>
+#endif
+
+class CliParser {
 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 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(CliParserArg::CliArgOption, longName, shortName, help, def);
+  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();
 
@@ -55,7 +59,7 @@ private:
     def(_def),
     value(QString()),
     boolValue(false) {};
-  
+
     CliArgType type;
     char shortName;
     QString help;
@@ -63,13 +67,21 @@ private:
     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);
+
+#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);
   QString lnameOfShortArg(const char arg);
+
   QStringList argsRaw;
   QHash<QString, CliParserArg> argsHash;
+
+#else
+  KCmdLineOptions _cmdLineOptions;
+#endif
 };
 
 #endif