/***************************************************************************
- * 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 *
#include "cliparser.h"
#include <QDir>
+#include <QDebug>
#include <QString>
#include <QFileInfo>
-#include <QDebug>
-void CliParser::addArgument(const QString &longName, const CliParserArg &arg) {
+CliParser::CliParser() : AbstractCliParser() {
+
+}
+
+void CliParser::addArgument(const QString &longName_, const CliParserArg &arg) {
+ QString longName = longName_;
+ longName.remove(QRegExp("\\s*<.*>\\s*")); // KCmdLineArgs takes args of the form "arg <defval>"
if(argsHash.contains(longName)) qWarning() << "Warning: Multiple definition of argument" << longName;
if(arg.shortName != 0 && !lnameOfShortArg(arg.shortName).isNull())
qWarning().nospace() << "Warning: Redefining shortName '" << arg.shortName << "' for " << longName << " previously defined for " << lnameOfShortArg(arg.shortName);
return escapedValue;
}
-bool CliParser::parse(const QStringList &args) {
+bool CliParser::init(const QStringList &args) {
argsRaw = args;
QStringList::const_iterator currentArg;
for (currentArg = argsRaw.constBegin(); currentArg != argsRaw.constEnd(); ++currentArg) {
if(arg.value().type == CliParserArg::CliArgOption && !arg.value().def.isNull()) {
output.append(". Default is: ").append(arg.value().def);
}
- qWarning() << output.toLatin1();
+ qWarning() << qPrintable(output);
}
}