X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fkcmdlinewrapper.cpp;h=afab45a9c689b48d7ef91a5524ed61af1ff4453e;hp=62f398052e00e6544ba02386e28942f4b5b7406e;hb=092e6b212637ffbf68800584b7c1f32d1931b602;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c

diff --git a/src/uisupport/kcmdlinewrapper.cpp b/src/uisupport/kcmdlinewrapper.cpp
index 62f39805..afab45a9 100644
--- a/src/uisupport/kcmdlinewrapper.cpp
+++ b/src/uisupport/kcmdlinewrapper.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,39 +15,55 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
+
 #include "kcmdlinewrapper.h"
 
 #include <KCmdLineArgs>
 
-KCmdLineWrapper::KCmdLineWrapper() {
-
+KCmdLineWrapper::KCmdLineWrapper()
+{
 }
 
-void KCmdLineWrapper::addArgument(const QString &longName, const CliParserArg &arg) {
-  if(arg.shortName != 0) {
-    _cmdLineOptions.add(QByteArray().append(arg.shortName));
-  }
-  _cmdLineOptions.add(longName.toUtf8(), ki18n(arg.help.toUtf8()), arg.def.toUtf8());
+
+void KCmdLineWrapper::addArgument(const QString &longName_, const CliParserArg &arg)
+{
+    QString longName = longName_;
+    if (arg.type == CliParserArg::CliArgOption && !arg.valueName.isEmpty())
+        longName += " <" + arg.valueName + ">";
+
+    if (arg.shortName != 0) {
+        _cmdLineOptions.add(QByteArray(1, arg.shortName));
+    }
+
+    _cmdLineOptions.add(longName.toUtf8(), ki18n(arg.help.toUtf8()), arg.def.toUtf8());
 }
 
-bool KCmdLineWrapper::init(const QStringList &) {
-  KCmdLineArgs::addCmdLineOptions(_cmdLineOptions);
-  return true;
+
+bool KCmdLineWrapper::init(const QStringList &)
+{
+    KCmdLineArgs::addCmdLineOptions(_cmdLineOptions);
+    return true;
 }
 
-QString KCmdLineWrapper::value(const QString &longName) {
-  return KCmdLineArgs::parsedArgs()->getOption(longName.toUtf8());
+
+QString KCmdLineWrapper::value(const QString &longName)
+{
+    return KCmdLineArgs::parsedArgs()->getOption(longName.toUtf8());
 }
 
-bool KCmdLineWrapper::isSet(const QString &longName) {
-  // KCmdLineArgs handles --nooption like NOT --option
-  if(longName.startsWith("no"))
-    return !KCmdLineArgs::parsedArgs()->isSet(longName.mid(2).toUtf8());
-  return KCmdLineArgs::parsedArgs()->isSet(longName.toUtf8());
+
+bool KCmdLineWrapper::isSet(const QString &longName)
+{
+    // KCmdLineArgs handles --nooption like NOT --option
+    if (longName.startsWith("no"))
+        return !KCmdLineArgs::parsedArgs()->isSet(longName.mid(2).toUtf8());
+    return KCmdLineArgs::parsedArgs()->isSet(longName.toUtf8());
 }
 
-void KCmdLineWrapper::usage() {
-  KCmdLineArgs::usage();
+
+void KCmdLineWrapper::usage()
+{
+    KCmdLineArgs::usage();
 }