From 996bbcd78ba50d71fa3da4727e5cb87ed9efe15a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 20 Aug 2012 13:04:39 +0200 Subject: micro-optimize: use POD-initializable lists of variable names Change-Id: I3732fef509b358949ef90002dbfc1960360afef8 Reviewed-by: Daniel Teske --- qmake/generators/win32/mingw_make.cpp | 4 ++-- qmake/generators/win32/msvc_nmake.cpp | 8 ++++---- qmake/generators/win32/winmakefile.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'qmake/generators/win32') diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 65e4e67fd7..c9834117e9 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -74,8 +74,8 @@ QString MingwMakefileGenerator::getLibTarget() bool MingwMakefileGenerator::findLibraries() { QList dirs; - const QString lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", QString() }; - for (int i = 0; !lflags[i].isNull(); i++) { + static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 }; + for (int i = 0; lflags[i]; i++) { QStringList &l = project->values(lflags[i]); QStringList::Iterator it = l.begin(); while (it != l.end()) { diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index a2b97d9c66..304cc452c0 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -312,16 +312,16 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &t) QHash source_directories; source_directories.insert(".", (void*)1); - QString directories[] = { QString("UI_SOURCES_DIR"), QString("UI_DIR"), QString() }; - for(int y = 0; !directories[y].isNull(); y++) { + static const char * const directories[] = { "UI_SOURCES_DIR", "UI_DIR", 0 }; + for (int y = 0; directories[y]; y++) { QString dirTemp = project->first(directories[y]); if (dirTemp.endsWith("\\")) dirTemp.truncate(dirTemp.length()-1); if(!dirTemp.isEmpty()) source_directories.insert(dirTemp, (void*)1); } - QString srcs[] = { QString("SOURCES"), QString("GENERATED_SOURCES"), QString() }; - for(int x = 0; !srcs[x].isNull(); x++) { + static const char * const srcs[] = { "SOURCES", "GENERATED_SOURCES", 0 }; + for (int x = 0; srcs[x]; x++) { const QStringList &l = project->values(srcs[x]); for (QStringList::ConstIterator sit = l.begin(); sit != l.end(); ++sit) { QString sep = "\\"; diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 13b11f6cdc..ca0995c735 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -107,8 +107,8 @@ bool Win32MakefileGenerator::findLibraries() { QList dirs; - const QString lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", QString() }; - for (int i = 0; !lflags[i].isNull(); i++) { + static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 }; + for (int i = 0; lflags[i]; i++) { QStringList &l = project->values(lflags[i]); for(QStringList::Iterator it = l.begin(); it != l.end();) { QChar quote; @@ -218,8 +218,8 @@ Win32MakefileGenerator::processPrlFiles() { const QString libArg = project->first("QMAKE_L_FLAG"); QList libdirs; - const QString lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", QString() }; - for (int i = 0; !lflags[i].isNull(); i++) { + static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 }; + for (int i = 0; lflags[i]; i++) { QStringList &l = project->values(lflags[i]); for (int lit = 0; lit < l.size(); ++lit) { QString opt = l.at(lit).trimmed(); -- cgit v1.2.3