manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed a bug

This commit is contained in:
Paolo Cignoni 2008-08-27 14:04:38 +00:00
parent 696941893d
commit d49e84fb9c
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
wrap/system/qgetopt.cpp
View File

@ -119,7 +119,7 @@ QString GetOpt::usage() {
case Option::ARGUMENT: case Option::ARGUMENT:
case Option::OPTIONAL: line += o.name; break; case Option::OPTIONAL: line += o.name; break;
case Option::SWITCH: line += "-" + QString(o.o) + " --" + o.name; break; case Option::SWITCH: line += "-" + QString(o.o) + " --" + o.name; break;
case Option::OPTION: line += "-" + QString(o.o) + " <val> --" + o.name + "=<val>"; break; case Option::OPTION: line += "-" + QString(o.o) + " <val> --" + o.name + " <val>"; break;
default: break; default: break;
} }
QString blank = ""; QString blank = "";
@ -153,33 +153,32 @@ bool GetOpt::parse(QString &error) {
error = "'--' feature not supported, yet"; error = "'--' feature not supported, yet";
return false; return false;
} }
// split key=value style arguments Option o;
int equal = arg.indexOf( '=' ); if(!findArg(arg, o)) {
QString val; error = "Unknown option: '" + arg + "'";
if(equal >= 0) { return false;
arg = arg.left(equal); }
val = arg.mid(equal + 1); if(o.type == Option::SWITCH) {
if(val.isEmpty()) { *(o.b) = true;
error = "Emtpy value for option '--" + arg + "'"; } else { //OPTION
i++;
if(args.size() <= i) {
error = "Missing value for option: " + arg;
return false; return false;
} }
arg = args[i];
if(i == args.size() || arg[0] == '-') {
error = "Missing argument after option '" + arg + "'";
return false;
}
QVariant v(arg);
if(!v.canConvert(o.value->type()) || !v.convert(o.value->type())) {
error = "Error while parsing option " + o.name + ": cannot convert " +
arg + " to: " + o.value->typeName();
return false;
}
*(o.value) = v;
} }
if(arg.isEmpty()) {
error = "Option long name missing: '--=" + val + "' is not a valid option";
return false;
}
Option o;
if(!findArg(arg, o) || (o.type != Option::OPTION && o.type != Option::SWITCH)) {
error = "Unknown option: '--" + arg + "'";
return false;
}
QVariant v(val);
if(!v.canConvert(o.value->type()) || !v.convert(o.value->type())) {
error = "Error while parsing option " + o.name + ": cannot convert " +
val + " to: " + o.value->typeName();
return false;
}
*(o.value) = v;
//option //option
} else if( arg[0] == '-' ) { } else if( arg[0] == '-' ) {