/***************************************************************************
- * 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>
-CliParser::CliParser(QStringList arguments)
-{
- argsRaw = arguments;
-// remove Qt internal debugging arguments
- argsRaw.removeOne("-sync");
- argsRaw.removeOne("-nograb");
- argsRaw.removeOne("-dograb");
+#include <iostream>
+
+CliParser::CliParser() : AbstractCliParser() {
+
}
-void CliParser::addArgument(const QString &longName, const CliParserArg &arg) {
+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);
bool CliParser::addLongArg(const CliParserArg::CliArgType type, const QString &name, const QString &value) {
if(argsHash.contains(name)){
if(type == CliParserArg::CliArgOption && argsHash.value(name).type == type) {
- argsHash[name].value = value;
+ argsHash[name].value = escapedValue(value);
return true;
}
else if (type == CliParserArg::CliArgSwitch && argsHash.value(name).type == type) {
QString longName = lnameOfShortArg(shortName);
if(!longName.isNull()) {
if(type == CliParserArg::CliArgOption && argsHash.value(longName).type == type) {
- argsHash[longName].value = value;
+ argsHash[longName].value = escapedValue(value);
return true;
}
else if (type == CliParserArg::CliArgSwitch) {
return false;
}
-bool CliParser::parse() {
+QString CliParser::escapedValue(const QString &value) {
+ QString escapedValue = value;
+ if(escapedValue.startsWith("~"))
+ escapedValue.replace(0, 1, QDir::homePath());
+
+ return escapedValue;
+}
+
+bool CliParser::init(const QStringList &args) {
+ argsRaw = args;
QStringList::const_iterator currentArg;
for (currentArg = argsRaw.constBegin(); currentArg != argsRaw.constEnd(); ++currentArg) {
if(currentArg->startsWith("--")) {
}
void CliParser::usage() {
- qWarning() << "Usage:" << QFileInfo(argsRaw.at(0)).completeBaseName() << "[arguments]";
-
+ std::cout << "Usage: " << qPrintable(QFileInfo(argsRaw.at(0)).completeBaseName()) << " [arguments]" << std::endl;
+
// get size of longName field
QStringList keys = argsHash.keys();
uint lnameFieldSize = 0;
size += 8;
if(size > lnameFieldSize) lnameFieldSize = size;
}
-
+
QHash<QString, CliParserArg>::const_iterator arg;
for(arg = argsHash.constBegin(); arg != argsHash.constEnd(); ++arg) {
QString output;
QString lnameField;
-
+
if(arg.value().shortName) {
output.append(" -").append(arg.value().shortName).append(",");
}
if(arg.value().type == CliParserArg::CliArgOption && !arg.value().def.isNull()) {
output.append(". Default is: ").append(arg.value().def);
}
- qWarning(output.toLatin1());
+ std::cout << qPrintable(output) << std::endl;
}
}