From 6957cb26b3f5a89b458283f4916198bf117db2b0 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 23 Apr 2012 18:08:16 +0200 Subject: don't overuse variables() Change-Id: Ib2da88e5e29c0bfecc39a9c06e82a34a4bd0b1e6 Reviewed-by: Joerg Bornemann --- qmake/generators/projectgenerator.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'qmake/generators/projectgenerator.cpp') diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp index 9a181a43f5..98f0e54258 100644 --- a/qmake/generators/projectgenerator.cpp +++ b/qmake/generators/projectgenerator.cpp @@ -77,7 +77,7 @@ ProjectGenerator::init() verifyCompilers(); project->read(QMakeProject::ReadFeatures); - project->variables()["CONFIG"].clear(); + project->values("CONFIG").clear(); QHash &v = project->variables(); QString templ = Option::user_template.isEmpty() ? QString("app") : Option::user_template; @@ -297,13 +297,13 @@ ProjectGenerator::init() } //strip out files that are actually output from internal compilers (ie temporary files) - const QStringList &quc = project->variables()["QMAKE_EXTRA_COMPILERS"]; + const QStringList &quc = project->values("QMAKE_EXTRA_COMPILERS"); for(QStringList::ConstIterator it = quc.begin(); it != quc.end(); ++it) { - QString tmp_out = project->variables()[(*it) + ".output"].first(); + QString tmp_out = project->first((*it) + ".output"); if(tmp_out.isEmpty()) continue; - QStringList var_out = project->variables()[(*it) + ".variable_out"]; + QStringList var_out = project->values((*it) + ".variable_out"); bool defaults = var_out.isEmpty(); for(int i = 0; i < var_out.size(); ++i) { QString v = var_out.at(i); @@ -317,15 +317,15 @@ ProjectGenerator::init() var_out << "HEADERS"; var_out << "FORMS"; } - const QStringList &tmp = project->variables()[(*it) + ".input"]; + const QStringList &tmp = project->values((*it) + ".input"); for(QStringList::ConstIterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) { - QStringList &inputs = project->variables()[(*it2)]; + QStringList &inputs = project->values(*it2); for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) { QString path = replaceExtraCompilerVariables(tmp_out, (*input), QString()); path = fixPathToQmake(path).section('/', -1); for(int i = 0; i < var_out.size(); ++i) { QString v = var_out.at(i); - QStringList &list = project->variables()[v]; + QStringList &list = project->values(v); for(int src = 0; src < list.size(); ) { if(list[src] == path || list[src].endsWith("/" + path)) list.removeAt(src); @@ -356,7 +356,7 @@ ProjectGenerator::writeMakefile(QTextStream &t) QString ofn = QFileInfo(static_cast(t.device())->fileName()).completeBaseName(); if (ofn.isEmpty() || ofn == "-") ofn = "unknown"; - project->variables()["TARGET_ASSIGN"] = QStringList(ofn); + project->values("TARGET_ASSIGN") = QStringList(ofn); t << getWritableVar("TARGET_ASSIGN") << getWritableVar("CONFIG", false) @@ -384,8 +384,8 @@ ProjectGenerator::addConfig(const QString &cfg, bool add) QString where = "CONFIG"; if(!add) where = "CONFIG_REMOVE"; - if(!project->variables()[where].contains(cfg)) { - project->variables()[where] += cfg; + if (!project->values(where).contains(cfg)) { + project->values(where) += cfg; return true; } return false; @@ -439,7 +439,7 @@ ProjectGenerator::addFile(QString file) QString newfile = fixPathToQmake(fileFixify(file)); - QStringList &endList = project->variables()[where]; + QStringList &endList = project->values(where); if(!endList.contains(newfile, Qt::CaseInsensitive)) { endList += newfile; return true; @@ -450,7 +450,7 @@ ProjectGenerator::addFile(QString file) QString ProjectGenerator::getWritableVar(const QString &v, bool) { - QStringList &vals = project->variables()[v]; + QStringList &vals = project->values(v); if(vals.isEmpty()) return ""; -- cgit v1.2.3