make a bunch of functions const

values() and variables() get both const and non-const overloads

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

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 45e2ee0..80e95f3 100644 (file)
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -3775,7 +3775,7 @@ QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringLis
     return place[var];
 }
 
-bool QMakeProject::isEmpty(const QString &v)
+bool QMakeProject::isEmpty(const QString &v) const
 {
     QHash<QString, QStringList>::ConstIterator it = vars.constFind(v);
     return it == vars.constEnd() || it->isEmpty();

diff --git a/qmake/project.h b/qmake/project.h
index e46c744..171016e 100644 (file)
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -164,11 +164,13 @@ public:
     bool isActiveConfig(const QString &x, bool regex=false,
                         QHash<QString, QStringList> *place=NULL);
 
-    bool isSet(const QString &v) { return vars.contains(v); }
-    bool isEmpty(const QString &v);
+    bool isSet(const QString &v) const { return vars.contains(v); }
+    bool isEmpty(const QString &v) const;
+    QStringList values(const QString &v) const { return vars[v]; }
     QStringList &values(const QString &v) { return vars[v]; }
-    QString first(const QString &v);
-    int intValue(const QString &v, int defaultValue = 0);
+    QString first(const QString &v) const;
+    int intValue(const QString &v, int defaultValue = 0) const;
+    const QHash<QString, QStringList> &variables() const { return vars; }
     QHash<QString, QStringList> &variables() { return vars; }
 
     bool isRecursive() const { return recursive; }
@@ -189,7 +191,7 @@ inline QString QMakeProject::projectFile()
     return pfile;
 }
 
-inline QString QMakeProject::first(const QString &v)
+inline QString QMakeProject::first(const QString &v) const
 {
     const QStringList vals = values(v);
     if(vals.isEmpty())
@@ -197,7 +199,7 @@ inline QString QMakeProject::first(const QString &v)
     return vals.first();
 }
 
-inline int QMakeProject::intValue(const QString &v, int defaultValue)
+inline int QMakeProject::intValue(const QString &v, int defaultValue) const
 {
     const QString str = first(v);
     if (!str.isEmpty()) {