Commit 3399e362 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

inline trivial functions

parent 9431850f
......@@ -915,10 +915,10 @@ QStringList ProFileEvaluator::Private::qmakeFeaturePaths()
QStringList feature_roots;
QByteArray mkspec_path = qgetenv("QMAKEFEATURES");
if (!mkspec_path.isNull())
feature_roots += splitPathList(QString::fromLocal8Bit(mkspec_path));
feature_roots += QString::fromLocal8Bit(mkspec_path).split(Option::dirlist_sep);
/*
if (prop)
feature_roots += splitPathList(prop->value("QMAKEFEATURES"));
feature_roots += prop->value("QMAKEFEATURES").split(Option::dirlist_sep);
if (!Option::mkfile::cachefile.isEmpty()) {
QString path;
int last_slash = Option::mkfile::cachefile.lastIndexOf(Option::dir_sep);
......@@ -931,7 +931,7 @@ QStringList ProFileEvaluator::Private::qmakeFeaturePaths()
QByteArray qmakepath = qgetenv("QMAKEPATH");
if (!qmakepath.isNull()) {
const QStringList lst = splitPathList(QString::fromLocal8Bit(qmakepath));
const QStringList lst = QString::fromLocal8Bit(qmakepath).split(Option::dirlist_sep);
foreach (const QString &item, lst) {
foreach (const QString &concat_it, concat)
feature_roots << (item + mkspecs_concat + concat_it);
......@@ -2165,7 +2165,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
q->logMessage(format("%1(message) requires one argument.").arg(function));
return ProItem::ReturnFalse;
}
QString msg = fixEnvVariables(args.first());
QString msg = Option::fixString(args.first(), Option::FixEnvVars);
q->fileMessage(QString::fromLatin1("Project %1: %2").arg(function.toUpper(), msg));
// ### Consider real termination in non-cumulative mode
return returnBool(function != QLatin1String("error"));
......
......@@ -147,16 +147,6 @@ static void replaceInList(QStringList *varlist,
}
}
inline QString fixEnvVariables(const QString &x)
{
return Option::fixString(x, Option::FixEnvVars);
}
inline QStringList splitPathList(const QString &paths)
{
return paths.split(Option::dirlist_sep);
}
static QStringList split_arg_list(QString params)
{
int quote = 0;
......@@ -262,7 +252,7 @@ static QStringList qmake_mkspec_paths()
const QString concat = QDir::separator() + QString(QLatin1String("mkspecs"));
QByteArray qmakepath = qgetenv("QMAKEPATH");
if (!qmakepath.isEmpty()) {
const QStringList lst = splitPathList(QString::fromLocal8Bit(qmakepath));
const QStringList lst = QString::fromLocal8Bit(qmakepath).split(Option::dirlist_sep);
for (QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it)
ret << ((*it) + concat);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment