X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fcliparser.cpp;h=5168ea22e0a9fc27ad0259d91b0751d6b8e0ecb9;hb=5a259061411e123d89059d815d1ea0f7cfcb3401;hp=ffaee23459a0637640cdda959d6e372b9d364fbc;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222;p=quassel.git diff --git a/src/common/cliparser.cpp b/src/common/cliparser.cpp index ffaee234..5168ea22 100644 --- a/src/common/cliparser.cpp +++ b/src/common/cliparser.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2012 by the Quassel Project * + * Copyright (C) 2005-2014 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -126,8 +126,8 @@ bool CliParser::init(const QStringList &args) // if next arg is a short/long option/switch the current arg is one too if (nextArg == argsRaw.constEnd() || nextArg->startsWith("-")) { // switch - for (int i = 0; i < currentArg->mid(1).toAscii().size(); i++) { - name = currentArg->mid(1).toAscii().at(i); + for (int i = 0; i < currentArg->mid(1).toLatin1().size(); i++) { + name = currentArg->mid(1).toLatin1().at(i); if (!addShortArg(CliParserArg::CliArgSwitch, name)) return false; } } @@ -135,7 +135,7 @@ bool CliParser::init(const QStringList &args) else { // option // short options are not freely mixable with other shortargs - if (currentArg->mid(1).toAscii().size() > 1) { + if (currentArg->mid(1).toLatin1().size() > 1) { qWarning() << "Warning: Shortoptions may not be combined with other shortoptions or switches"; return false; } @@ -146,7 +146,7 @@ bool CliParser::init(const QStringList &args) skipNext = true; } else value = currentArg->toLocal8Bit(); - name = currentArg->mid(1).toAscii().at(0); + name = currentArg->mid(1).toLatin1().at(0); // we took one argument as argument to an option so skip it next time if (skipNext) currentArg++; if (!addShortArg(CliParserArg::CliArgOption, name, value)) return false;