feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

unify parsing of boolean arguments

Browse Source
This commit is contained in:
Oswald Buddenhagen
2010-04-29 17:46:57 +02:00
parent 33c5befc7f
commit 95d5ad4ab3
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/shared/proparser/profileevaluator.cpp
View File

@@ -1166,6 +1166,11 @@ static QString fixPathToLocalOS(const QString &str)
return string; return string;
} }
static bool isTrue(const QString &str)
{
return !str.compare(statics.strtrue, Qt::CaseInsensitive) || str.toInt();
}
//////// Evaluator ///////// //////// Evaluator /////////
ProItem::ProItemReturn ProFileEvaluator::Private::visitProBlock(ProItem *items) ProItem::ProItemReturn ProFileEvaluator::Private::visitProBlock(ProItem *items)
@@ -2258,7 +2263,7 @@ QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &fun
bool singleLine = true; bool singleLine = true;
if (args.count() > 1) if (args.count() > 1)
singleLine = (!args[1].compare(statics.strtrue, Qt::CaseInsensitive)); singleLine = isTrue(args.at(1));
QFile qfile(resolvePath(expandEnvVars(file))); QFile qfile(resolvePath(expandEnvVars(file)));
if (qfile.open(QIODevice::ReadOnly)) { if (qfile.open(QIODevice::ReadOnly)) {
@@ -2318,7 +2323,7 @@ QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &fun
+ QLatin1String(" && ") + args[0]).toLatin1(), "r"); + QLatin1String(" && ") + args[0]).toLatin1(), "r");
bool singleLine = true; bool singleLine = true;
if (args.count() > 1) if (args.count() > 1)
singleLine = (!args[1].compare(QLatin1String("true"), Qt::CaseInsensitive)); singleLine = isTrue(args.at(1));
QString output; QString output;
while (proc && !feof(proc)) { while (proc && !feof(proc)) {
int read_in = int(fread(buff, 1, 255, proc)); int read_in = int(fread(buff, 1, 255, proc));
@@ -2399,7 +2404,7 @@ QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &fun
} else { } else {
bool recursive = false; bool recursive = false;
if (args.count() == 2) if (args.count() == 2)
recursive = (!args[1].compare(statics.strtrue, Qt::CaseInsensitive) || args[1].toInt()); recursive = isTrue(args.at(1));
QStringList dirs; QStringList dirs;
QString r = fixPathToLocalOS(args[0]); QString r = fixPathToLocalOS(args[0]);
QString pfx; QString pfx;
@@ -2842,8 +2847,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
return ProItem::ReturnFalse; return ProItem::ReturnFalse;
bool ignore_error = false; bool ignore_error = false;
if (args.count() == 2) { if (args.count() == 2) {
QString sarg = args[1]; ignore_error = isTrue(args.at(1));
ignore_error = (!sarg.compare(statics.strtrue, Qt::CaseInsensitive) || sarg.toInt());
} else if (args.count() != 1) { } else if (args.count() != 1) {
logMessage(format("load(feature) requires one or two arguments.")); logMessage(format("load(feature) requires one or two arguments."));
return ProItem::ReturnFalse; return ProItem::ReturnFalse;