- }
- // if next arg is is no option/switch it's an argument to a shortoption
- else {
- // option
- QString value = currentArg->toUtf8();
- if(bla) --currentArg;
- name = currentArg->mid(1).toAscii().at(0);
- if(bla) currentArg++;
- if(shortHash.contains(name) && shortHash.value(name).value().type == CliParserArg::CliArgOption) {
- shortHash[name].value().value = value;
+ else if (currentArg->startsWith("-")) {
+ // short
+ char name;
+ QStringList::const_iterator nextArg = currentArg+1;
+ // 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).toLatin1().size(); i++) {
+ name = currentArg->mid(1).toLatin1().at(i);
+ if (!addShortArg(CliParserArg::CliArgSwitch, name)) return false;
+ }
+ }
+ // if next arg is is no option/switch it's an argument to a shortoption
+ else {
+ // option
+ // short options are not freely mixable with other shortargs
+ if (currentArg->mid(1).toLatin1().size() > 1) {
+ qWarning() << "Warning: Shortoptions may not be combined with other shortoptions or switches";
+ return false;
+ }
+ QString value;
+ bool skipNext = false;
+ if (nextArg != argsRaw.constEnd()) {
+ value = nextArg->toLocal8Bit();
+ skipNext = true;
+ }
+ else value = currentArg->toLocal8Bit();
+ 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;
+ }
+ }
+ else {
+ // we don't support plain arguments without -/--
+ if (currentArg->toLatin1() != argsRaw.at(0)) return false;