diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-23 16:20:30 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 14:35:29 +0200 |
commit | f85292ab206adaa43a9c8e4bfb02249cc4b2ea4d (patch) | |
tree | 30100cdaa64c9caa561e3e44fec31f6bcb5abcc0 /qmake/generators/unix | |
parent | e0f1de0788954ff78f796a1f732800e762075cb0 (diff) |
const correctness for values() calls
Change-Id: I1476ae8d3fb7364686398c5650729dee94a8e933
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'qmake/generators/unix')
-rw-r--r-- | qmake/generators/unix/unixmake.cpp | 2 | ||||
-rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 28 |
2 files changed, 16 insertions, 14 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 02f8666bbb..31b059decc 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -742,7 +742,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t) QStringList links; QString target="$(TARGET)"; - QStringList &targets = project->values(t + ".targets"); + const QStringList &targets = project->values(t + ".targets"); if(!project->isEmpty("QMAKE_BUNDLE")) { target = project->first("QMAKE_BUNDLE"); bundle = true; diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 490b76e494..f13699f0f7 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -82,7 +82,7 @@ UnixMakefileGenerator::writeMakefile(QTextStream &t) writeHeader(t); if(!project->values("QMAKE_FAILED_REQUIREMENTS").isEmpty()) { t << "QMAKE = " << var("QMAKE_QMAKE") << endl; - QStringList &qut = project->values("QMAKE_EXTRA_TARGETS"); + const QStringList &qut = project->values("QMAKE_EXTRA_TARGETS"); for(QStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it) t << *it << " "; t << "first all clean install distclean uninstall qmake_all:" << "\n\t" @@ -190,11 +190,13 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) t << "SOURCES = " << valList(escapeFilePaths(project->values("SOURCES"))) << " " << valList(escapeFilePaths(project->values("GENERATED_SOURCES"))) << endl; if(do_incremental) { - QStringList &objs = project->values("OBJECTS"), &incrs = project->values("QMAKE_INCREMENTAL"), incrs_out; + const QStringList &objs = project->values("OBJECTS"); + const QStringList &incrs = project->values("QMAKE_INCREMENTAL"); + QStringList incrs_out; t << "OBJECTS = "; - for(QStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) { + for (QStringList::ConstIterator objit = objs.begin(); objit != objs.end(); ++objit) { bool increment = false; - for(QStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) { + for (QStringList::ConstIterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) { if((*objit).indexOf(QRegExp((*incrit), Qt::CaseSensitive, QRegExp::Wildcard)) != -1) { increment = true; @@ -247,8 +249,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) t << endl; // blasted includes - QStringList &qeui = project->values("QMAKE_EXTRA_INCLUDES"); - QStringList::Iterator it; + const QStringList &qeui = project->values("QMAKE_EXTRA_INCLUDES"); + QStringList::ConstIterator it; for(it = qeui.begin(); it != qeui.end(); ++it) t << "include " << (*it) << endl; @@ -301,8 +303,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) QString src[] = { "SOURCES", "GENERATED_SOURCES", QString() }; for(int x = 0; !src[x].isNull(); x++) { - QStringList &l = project->values(src[x]); - for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) { + const QStringList &l = project->values(src[x]); + for (QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { if(!(*it).isEmpty()) { QString d_file; for(QStringList::Iterator cit = Option::c_ext.begin(); @@ -343,15 +345,15 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) if(!project->isEmpty("SUBLIBS_DIR")) libdir = project->first("SUBLIBS_DIR"); t << "SUBLIBS = "; - QStringList &l = project->values("SUBLIBS"); - for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) + const QStringList &l = project->values("SUBLIBS"); + for (QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) t << libdir << project->first("QMAKE_PREFIX_STATICLIB") << (*it) << "." << project->first("QMAKE_EXTENSION_STATICLIB") << " "; t << endl << endl; } if(project->isActiveConfig("depend_prl") && !project->isEmpty("QMAKE_PRL_INTERNAL_FILES")) { - QStringList &l = project->values("QMAKE_PRL_INTERNAL_FILES"); - QStringList::Iterator it; + const QStringList &l = project->values("QMAKE_PRL_INTERNAL_FILES"); + QStringList::ConstIterator it; for(it = l.begin(); it != l.end(); ++it) { QMakeMetaInfo libinfo; if(libinfo.readLib((*it)) && !libinfo.isEmpty("QMAKE_PRL_BUILD_DIR")) { @@ -886,7 +888,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) QString libdir = "tmp/"; if(!project->isEmpty("SUBLIBS_DIR")) libdir = project->first("SUBLIBS_DIR"); - QStringList &l = project->values("SUBLIBS"); + const QStringList &l = project->values("SUBLIBS"); for(it = l.begin(); it != l.end(); ++it) t << libdir << project->first("QMAKE_PREFIX_STATICLIB") << (*it) << "." << project->first("QMAKE_EXTENSION_STATICLIB") << ":\n\t" |