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

const correctness for variables()

Browse Source 
Change-Id: Id11453ccbae3ffa32580badadada945d342d727a
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
This commit is contained in:
Oswald Buddenhagen 2012-04-23 17:01:45 +02:00
parent 6957cb26b3
commit aac040b188
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/generators/mac/pbuilder_pbx.cpp
View File

@ -168,8 +168,8 @@ ProjectBuilderMakefileGenerator::writeSubDirs(QTextStream &t)
if(tmp_proj.read(fn)) { if(tmp_proj.read(fn)) {
if(Option::debug_level) { if(Option::debug_level) {
debug_msg(1, "Dumping all variables:"); debug_msg(1, "Dumping all variables:");
QHash<QString, QStringList> &vars = tmp_proj.variables(); const QHash<QString, QStringList> &vars = tmp_proj.variables();
for(QHash<QString, QStringList>::Iterator it = vars.begin(); for (QHash<QString, QStringList>::ConstIterator it = vars.begin();
it != vars.end(); ++it) { it != vars.end(); ++it) {
if(it.key().left(1) != "." && !it.value().isEmpty()) if(it.key().left(1) != "." && !it.value().isEmpty())
debug_msg(1, "%s: %s === %s", fn.toLatin1().constData(), it.key().toLatin1().constData(), debug_msg(1, "%s: %s === %s", fn.toLatin1().constData(), it.key().toLatin1().constData(),

2
qmake/generators/makefile.cpp
View File

@ -317,7 +317,7 @@ QStringList
MakefileGenerator::findFilesInVPATH(QStringList l, uchar flags, const QString &vpath_var) MakefileGenerator::findFilesInVPATH(QStringList l, uchar flags, const QString &vpath_var)
{ {
QStringList vpath; QStringList vpath;
QHash<QString, QStringList> &v = project->variables(); const QHash<QString, QStringList> &v = project->variables();
for(int val_it = 0; val_it < l.count(); ) { for(int val_it = 0; val_it < l.count(); ) {
bool remove_file = false; bool remove_file = false;
QString &val = l[val_it]; QString &val = l[val_it];

4
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -485,8 +485,8 @@ void VcprojGenerator::writeSubDirs(QTextStream &t)
Option::output_dir = old_output_dir; Option::output_dir = old_output_dir;
if(Option::debug_level) { if(Option::debug_level) {
debug_msg(1, "Dumping all variables:"); debug_msg(1, "Dumping all variables:");
QHash<QString, QStringList> &vars = tmp_proj.variables(); const QHash<QString, QStringList> &vars = tmp_proj.variables();
for(QHash<QString, QStringList>::Iterator it = vars.begin(); for (QHash<QString, QStringList>::ConstIterator it = vars.begin();
it != vars.end(); ++it) { it != vars.end(); ++it) {
if(it.key().left(1) != "." && !it.value().isEmpty()) if(it.key().left(1) != "." && !it.value().isEmpty())
debug_msg(1, "%s: %s === %s", fn.toLatin1().constData(), it.key().toLatin1().constData(), debug_msg(1, "%s: %s === %s", fn.toLatin1().constData(), it.key().toLatin1().constData(),

4
qmake/meta.cpp
View File

@ -142,8 +142,8 @@ QMakeMetaInfo::readLibtoolFile(const QString &f)
dirf = ""; dirf = "";
else if(!dirf.isEmpty() && !dirf.endsWith(Option::output_dir)) else if(!dirf.isEmpty() && !dirf.endsWith(Option::output_dir))
dirf += QLatin1Char('/'); dirf += QLatin1Char('/');
QHash<QString, QStringList> &v = proj.variables(); const QHash<QString, QStringList> &v = proj.variables();
for(QHash<QString, QStringList>::Iterator it = v.begin(); it != v.end(); ++it) { for (QHash<QString, QStringList>::ConstIterator it = v.begin(); it != v.end(); ++it) {
QStringList lst = it.value(); QStringList lst = it.value();
if(lst.count() == 1 && (lst.first().startsWith("'") || lst.first().startsWith("\"")) && if(lst.count() == 1 && (lst.first().startsWith("'") || lst.first().startsWith("\"")) &&
lst.first().endsWith(QString(lst.first()[0]))) lst.first().endsWith(QString(lst.first()[0])))