From 0a19b9ec703f089cb9a7d6dfd03f0f48527508e3 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 7 Dec 2013 20:35:18 +0100 Subject: qmake: fix const correctness Partial cherry-pick of https://qt.gitorious.org/qt/jpnurmi-qt/commit/8c4ef19 Task-number: QTBUG-21910 Change-Id: Ieb833a977fc00d2637f8419278698c82b6086e2f Reviewed-by: Oswald Buddenhagen --- qmake/generators/makefile.cpp | 20 ++++++++++---------- qmake/generators/makefile.h | 20 ++++++++++---------- qmake/generators/win32/msvc_nmake.cpp | 2 +- qmake/generators/win32/msvc_nmake.h | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'qmake') diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 3dd63b4590..0dc367a38c 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1420,31 +1420,31 @@ MakefileGenerator::writeInstalls(QTextStream &t, bool noBuild) } QString -MakefileGenerator::var(const ProKey &var) +MakefileGenerator::var(const ProKey &var) const { return val(project->values(var)); } QString -MakefileGenerator::val(const ProStringList &varList) +MakefileGenerator::val(const ProStringList &varList) const { return valGlue(varList, "", " ", ""); } QString -MakefileGenerator::val(const QStringList &varList) +MakefileGenerator::val(const QStringList &varList) const { return valGlue(varList, "", " ", ""); } QString -MakefileGenerator::varGlue(const ProKey &var, const QString &before, const QString &glue, const QString &after) +MakefileGenerator::varGlue(const ProKey &var, const QString &before, const QString &glue, const QString &after) const { return valGlue(project->values(var), before, glue, after); } QString -MakefileGenerator::fileVarGlue(const ProKey &var, const QString &before, const QString &glue, const QString &after) +MakefileGenerator::fileVarGlue(const ProKey &var, const QString &before, const QString &glue, const QString &after) const { ProStringList varList; foreach (const ProString &val, project->values(var)) @@ -1453,7 +1453,7 @@ MakefileGenerator::fileVarGlue(const ProKey &var, const QString &before, const Q } QString -MakefileGenerator::valGlue(const ProStringList &varList, const QString &before, const QString &glue, const QString &after) +MakefileGenerator::valGlue(const ProStringList &varList, const QString &before, const QString &glue, const QString &after) const { QString ret; for (ProStringList::ConstIterator it = varList.begin(); it != varList.end(); ++it) { @@ -1467,7 +1467,7 @@ MakefileGenerator::valGlue(const ProStringList &varList, const QString &before, } QString -MakefileGenerator::valGlue(const QStringList &varList, const QString &before, const QString &glue, const QString &after) +MakefileGenerator::valGlue(const QStringList &varList, const QString &before, const QString &glue, const QString &after) const { QString ret; for(QStringList::ConstIterator it = varList.begin(); it != varList.end(); ++it) { @@ -1482,19 +1482,19 @@ MakefileGenerator::valGlue(const QStringList &varList, const QString &before, co QString -MakefileGenerator::varList(const ProKey &var) +MakefileGenerator::varList(const ProKey &var) const { return valList(project->values(var)); } QString -MakefileGenerator::valList(const ProStringList &varList) +MakefileGenerator::valList(const ProStringList &varList) const { return valGlue(varList, "", " \\\n\t\t", ""); } QString -MakefileGenerator::valList(const QStringList &varList) +MakefileGenerator::valList(const QStringList &varList) const { return valGlue(varList, "", " \\\n\t\t", ""); } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index 4b8a96c15f..a382ca6bf6 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -225,16 +225,16 @@ protected: virtual bool findLibraries(); //for retrieving values and lists of values - virtual QString var(const ProKey &var); - QString varGlue(const ProKey &var, const QString &before, const QString &glue, const QString &after); - QString fileVarGlue(const ProKey &var, const QString &before, const QString &glue, const QString &after); - QString varList(const ProKey &var); - QString val(const ProStringList &varList); - QString val(const QStringList &varList); - QString valGlue(const QStringList &varList, const QString &before, const QString &glue, const QString &after); - QString valGlue(const ProStringList &varList, const QString &before, const QString &glue, const QString &after); - QString valList(const QStringList &varList); - QString valList(const ProStringList &varList); + virtual QString var(const ProKey &var) const; + QString varGlue(const ProKey &var, const QString &before, const QString &glue, const QString &after) const; + QString fileVarGlue(const ProKey &var, const QString &before, const QString &glue, const QString &after) const; + QString varList(const ProKey &var) const; + QString val(const ProStringList &varList) const; + QString val(const QStringList &varList) const; + QString valGlue(const QStringList &varList, const QString &before, const QString &glue, const QString &after) const; + QString valGlue(const ProStringList &varList, const QString &before, const QString &glue, const QString &after) const; + QString valList(const QStringList &varList) const; + QString valList(const ProStringList &varList) const; QString filePrefixRoot(const QString &, const QString &); diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index e742288c35..acccdc1bdc 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -303,7 +303,7 @@ void NmakeMakefileGenerator::writeNmakeParts(QTextStream &t) } } -QString NmakeMakefileGenerator::var(const ProKey &value) +QString NmakeMakefileGenerator::var(const ProKey &value) const { if (usePCH) { if ((value == "QMAKE_RUN_CXX_IMP_BATCH" diff --git a/qmake/generators/win32/msvc_nmake.h b/qmake/generators/win32/msvc_nmake.h index 7a47bb8cec..4d3c69bdd6 100644 --- a/qmake/generators/win32/msvc_nmake.h +++ b/qmake/generators/win32/msvc_nmake.h @@ -62,7 +62,7 @@ protected: virtual QString getPdbTarget(); virtual QString defaultInstall(const QString &t); virtual QStringList &findDependencies(const QString &file); - QString var(const ProKey &value); + QString var(const ProKey &value) const; QString precompH, precompObj, precompPch; bool usePCH; -- cgit v1.2.3