diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-23 17:01:45 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-27 14:35:30 +0200 |
| commit | aac040b1881056f52c22c67dc7bb7f81f4c7a02f (patch) | |
| tree | 1239dd9572cf2d6cd49a678ddad515b8369fe601 | |
| parent | 6957cb26b3f5a89b458283f4916198bf117db2b0 (diff) | |
const correctness for variables()
Change-Id: Id11453ccbae3ffa32580badadada945d342d727a
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 4 | ||||
| -rw-r--r-- | qmake/generators/makefile.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 | ||||
| -rw-r--r-- | qmake/meta.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index b1b4c4381f..c967e18bfe 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -168,8 +168,8 @@ ProjectBuilderMakefileGenerator::writeSubDirs(QTextStream &t) if(tmp_proj.read(fn)) { if(Option::debug_level) { debug_msg(1, "Dumping all variables:"); - QHash<QString, QStringList> &vars = tmp_proj.variables(); - for(QHash<QString, QStringList>::Iterator it = vars.begin(); + const QHash<QString, QStringList> &vars = tmp_proj.variables(); + for (QHash<QString, QStringList>::ConstIterator it = vars.begin(); it != vars.end(); ++it) { if(it.key().left(1) != "." && !it.value().isEmpty()) debug_msg(1, "%s: %s === %s", fn.toLatin1().constData(), it.key().toLatin1().constData(), diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index cfa84fdc0e..c4e0a4face 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -317,7 +317,7 @@ QStringList MakefileGenerator::findFilesInVPATH(QStringList l, uchar flags, const QString &vpath_var) { QStringList vpath; - QHash<QString, QStringList> &v = project->variables(); + const QHash<QString, QStringList> &v = project->variables(); for(int val_it = 0; val_it < l.count(); ) { bool remove_file = false; QString &val = l[val_it]; diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 92daed0c0c..2162841502 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -485,8 +485,8 @@ void VcprojGenerator::writeSubDirs(QTextStream &t) Option::output_dir = old_output_dir; if(Option::debug_level) { debug_msg(1, "Dumping all variables:"); - QHash<QString, QStringList> &vars = tmp_proj.variables(); - for(QHash<QString, QStringList>::Iterator it = vars.begin(); + const QHash<QString, QStringList> &vars = tmp_proj.variables(); + for (QHash<QString, QStringList>::ConstIterator it = vars.begin(); it != vars.end(); ++it) { if(it.key().left(1) != "." && !it.value().isEmpty()) debug_msg(1, "%s: %s === %s", fn.toLatin1().constData(), it.key().toLatin1().constData(), diff --git a/qmake/meta.cpp b/qmake/meta.cpp index ecd78e3455..5577dedabe 100644 --- a/qmake/meta.cpp +++ b/qmake/meta.cpp @@ -142,8 +142,8 @@ QMakeMetaInfo::readLibtoolFile(const QString &f) dirf = ""; else if(!dirf.isEmpty() && !dirf.endsWith(Option::output_dir)) dirf += QLatin1Char('/'); - QHash<QString, QStringList> &v = proj.variables(); - for(QHash<QString, QStringList>::Iterator it = v.begin(); it != v.end(); ++it) { + const QHash<QString, QStringList> &v = proj.variables(); + for (QHash<QString, QStringList>::ConstIterator it = v.begin(); it != v.end(); ++it) { QStringList lst = it.value(); if(lst.count() == 1 && (lst.first().startsWith("'") || lst.first().startsWith("\"")) && lst.first().endsWith(QString(lst.first()[0]))) |