const correctness for variables()

Change-Id: Id11453ccbae3ffa32580badadada945d342d727a
Reviewed-by: Mark Brand <mabrand@mabrand.nl>

diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index b1b4c43..c967e18 100644 (file)
--- 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 cfa84fd..c4e0a4f 100644 (file)
--- 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 92daed0..2162841 100644 (file)
--- 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 ecd78e3..5577ded 100644 (file)
--- 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])))