micro-optimize: use POD-initializable lists of variable names

Change-Id: I3732fef509b358949ef90002dbfc1960360afef8
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

2 files changed, 12 insertions, 12 deletions

diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 7938c5be79..e7f8b6156f 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -344,15 +344,15 @@ UnixMakefileGenerator::init()
     }
 
     if(project->isActiveConfig("compile_libtool")) {
-        const QString libtoolify[] = { "QMAKE_RUN_CC", "QMAKE_RUN_CC_IMP",
-                                       "QMAKE_RUN_CXX", "QMAKE_RUN_CXX_IMP",
-                                       "QMAKE_LINK_THREAD", "QMAKE_LINK", "QMAKE_AR_CMD", "QMAKE_LINK_SHLIB_CMD",
-                                       QString() };
-        for(int i = 0; !libtoolify[i].isNull(); i++) {
+        static const char * const libtoolify[] = {
+            "QMAKE_RUN_CC", "QMAKE_RUN_CC_IMP", "QMAKE_RUN_CXX", "QMAKE_RUN_CXX_IMP",
+            "QMAKE_LINK_THREAD", "QMAKE_LINK", "QMAKE_AR_CMD", "QMAKE_LINK_SHLIB_CMD", 0
+        };
+        for (int i = 0; libtoolify[i]; i++) {
             QStringList &l = project->values(libtoolify[i]);
             if(!l.isEmpty()) {
                 QString libtool_flags, comp_flags;
-                if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") {
+                if (!strncmp(libtoolify[i], "QMAKE_LINK", 10) || !strcmp(libtoolify[i], "QMAKE_AR_CMD")) {
                     libtool_flags += " --mode=link";
                     if(project->isActiveConfig("staticlib")) {
                         libtool_flags += " -static";
@@ -468,8 +468,8 @@ UnixMakefileGenerator::findLibraries()
     int libidx = 0;
     foreach (const QString &dlib, project->values("QMAKE_DEFAULT_LIBDIRS"))
         libdirs.append(QMakeLocalFileName(dlib));
-    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(); ) {
             QString stub, dir, extn, opt = (*it).trimmed();
@@ -574,8 +574,8 @@ UnixMakefileGenerator::processPrlFiles()
         libdirs.append(QMakeLocalFileName(dlib));
     frameworkdirs.append(QMakeLocalFileName("/System/Library/Frameworks"));
     frameworkdirs.append(QMakeLocalFileName("/Library/Frameworks"));
-    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();
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 6d03fab8ff..6e01da5baf 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -299,8 +299,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
             t << mkdir_p_asstring("$(@D)") << "\n\t"
               << "@$(CC) " << cmd << " $< | sed \"s,^\\($(*F).o\\):," << odir << "\\1:,g\" >$@" << endl << endl;
 
-            QString src[] = { "SOURCES", "GENERATED_SOURCES", QString() };
-            for(int x = 0; !src[x].isNull(); x++) {
+            static const char * const src[] = { "SOURCES", "GENERATED_SOURCES", 0 };
+            for (int x = 0; src[x]; x++) {
                 const QStringList &l = project->values(src[x]);
                 for (QStringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
                     if(!(*it).isEmpty()) {