1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make a bunch of functions const

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

Change-Id: Idfabea1acc488bf78f24edb831681ee07f0074c4
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
This commit is contained in:
Oswald Buddenhagen 2012-04-23 17:06:58 +02:00
parent aac040b188
commit a54875057f
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/project.cpp
View File

@ -3775,7 +3775,7 @@ QStringList &QMakeProject::values(const QString &_var, QHash<QString, QStringLis
return place[var]; return place[var];
} }
bool QMakeProject::isEmpty(const QString &v) bool QMakeProject::isEmpty(const QString &v) const
{ {
QHash<QString, QStringList>::ConstIterator it = vars.constFind(v); QHash<QString, QStringList>::ConstIterator it = vars.constFind(v);
return it == vars.constEnd() || it->isEmpty(); return it == vars.constEnd() || it->isEmpty();

14
qmake/project.h
View File

@ -164,11 +164,13 @@ public:
bool isActiveConfig(const QString &x, bool regex=false, bool isActiveConfig(const QString &x, bool regex=false,
QHash<QString, QStringList> *place=NULL); QHash<QString, QStringList> *place=NULL);
bool isSet(const QString &v) { return vars.contains(v); } bool isSet(const QString &v) const { return vars.contains(v); }
bool isEmpty(const QString &v); bool isEmpty(const QString &v) const;
QStringList values(const QString &v) const { return vars[v]; }
QStringList &values(const QString &v) { return vars[v]; } QStringList &values(const QString &v) { return vars[v]; }
QString first(const QString &v); QString first(const QString &v) const;
int intValue(const QString &v, int defaultValue = 0); int intValue(const QString &v, int defaultValue = 0) const;
const QHash<QString, QStringList> &variables() const { return vars; }
QHash<QString, QStringList> &variables() { return vars; } QHash<QString, QStringList> &variables() { return vars; }
bool isRecursive() const { return recursive; } bool isRecursive() const { return recursive; }
@ -189,7 +191,7 @@ inline QString QMakeProject::projectFile()
return pfile; return pfile;
} }
inline QString QMakeProject::first(const QString &v) inline QString QMakeProject::first(const QString &v) const
{ {
const QStringList vals = values(v); const QStringList vals = values(v);
if(vals.isEmpty()) if(vals.isEmpty())
@ -197,7 +199,7 @@ inline QString QMakeProject::first(const QString &v)
return vals.first(); 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); const QString str = first(v);
if (!str.isEmpty()) { if (!str.isEmpty()) {