qmake: restore coding style

this reverts 2631ffabd5a7955a40b9779b0d52af64e3bd3a60 for qmake*.cpp.

i refuse to deal with the merging hell this introduced, thank you very
much.

Change-Id: I3e3a11fc0ad73c600976da0f3a13c8791250eb09
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

2 files changed, 107 insertions, 107 deletions

diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp
index c2625166cb..cb605e5810 100644
--- a/src/shared/proparser/qmakebuiltins.cpp
+++ b/src/shared/proparser/qmakebuiltins.cpp
@@ -107,53 +107,53 @@ void QMakeEvaluator::initFunctionStatics()
         const char * const name;
         const ExpandFunc func;
     } expandInits[] = {
-        {"member", E_MEMBER},
-        {"str_member", E_STR_MEMBER},
-        {"first", E_FIRST},
-        {"take_first", E_TAKE_FIRST},
-        {"last", E_LAST},
-        {"take_last", E_TAKE_LAST},
-        {"size", E_SIZE},
-        {"str_size", E_STR_SIZE},
-        {"cat", E_CAT},
-        {"fromfile", E_FROMFILE},
-        {"eval", E_EVAL},
-        {"list", E_LIST},
-        {"sprintf", E_SPRINTF},
-        {"format_number", E_FORMAT_NUMBER},
-        {"num_add", E_NUM_ADD},
-        {"join", E_JOIN},
-        {"split", E_SPLIT},
-        {"basename", E_BASENAME},
-        {"dirname", E_DIRNAME},
-        {"section", E_SECTION},
-        {"find", E_FIND},
-        {"system", E_SYSTEM},
-        {"unique", E_UNIQUE},
-        {"sorted", E_SORTED},
-        {"reverse", E_REVERSE},
-        {"quote", E_QUOTE},
-        {"escape_expand", E_ESCAPE_EXPAND},
-        {"upper", E_UPPER},
-        {"lower", E_LOWER},
-        {"title", E_TITLE},
-        {"re_escape", E_RE_ESCAPE},
-        {"val_escape", E_VAL_ESCAPE},
-        {"files", E_FILES},
-        {"prompt", E_PROMPT},
-        {"replace", E_REPLACE},
-        {"sort_depends", E_SORT_DEPENDS},
-        {"resolve_depends", E_RESOLVE_DEPENDS},
-        {"enumerate_vars", E_ENUMERATE_VARS},
-        {"shadowed", E_SHADOWED},
-        {"absolute_path", E_ABSOLUTE_PATH},
-        {"relative_path", E_RELATIVE_PATH},
-        {"clean_path", E_CLEAN_PATH},
-        {"system_path", E_SYSTEM_PATH},
-        {"shell_path", E_SHELL_PATH},
-        {"system_quote", E_SYSTEM_QUOTE},
-        {"shell_quote", E_SHELL_QUOTE},
-        {"getenv", E_GETENV},
+        { "member", E_MEMBER },
+        { "str_member", E_STR_MEMBER },
+        { "first", E_FIRST },
+        { "take_first", E_TAKE_FIRST },
+        { "last", E_LAST },
+        { "take_last", E_TAKE_LAST },
+        { "size", E_SIZE },
+        { "str_size", E_STR_SIZE },
+        { "cat", E_CAT },
+        { "fromfile", E_FROMFILE },
+        { "eval", E_EVAL },
+        { "list", E_LIST },
+        { "sprintf", E_SPRINTF },
+        { "format_number", E_FORMAT_NUMBER },
+        { "num_add", E_NUM_ADD },
+        { "join", E_JOIN },
+        { "split", E_SPLIT },
+        { "basename", E_BASENAME },
+        { "dirname", E_DIRNAME },
+        { "section", E_SECTION },
+        { "find", E_FIND },
+        { "system", E_SYSTEM },
+        { "unique", E_UNIQUE },
+        { "sorted", E_SORTED },
+        { "reverse", E_REVERSE },
+        { "quote", E_QUOTE },
+        { "escape_expand", E_ESCAPE_EXPAND },
+        { "upper", E_UPPER },
+        { "lower", E_LOWER },
+        { "title", E_TITLE },
+        { "re_escape", E_RE_ESCAPE },
+        { "val_escape", E_VAL_ESCAPE },
+        { "files", E_FILES },
+        { "prompt", E_PROMPT },
+        { "replace", E_REPLACE },
+        { "sort_depends", E_SORT_DEPENDS },
+        { "resolve_depends", E_RESOLVE_DEPENDS },
+        { "enumerate_vars", E_ENUMERATE_VARS },
+        { "shadowed", E_SHADOWED },
+        { "absolute_path", E_ABSOLUTE_PATH },
+        { "relative_path", E_RELATIVE_PATH },
+        { "clean_path", E_CLEAN_PATH },
+        { "system_path", E_SYSTEM_PATH },
+        { "shell_path", E_SHELL_PATH },
+        { "system_quote", E_SYSTEM_QUOTE },
+        { "shell_quote", E_SHELL_QUOTE },
+        { "getenv", E_GETENV },
     };
     statics.expands.reserve((int)(sizeof(expandInits)/sizeof(expandInits[0])));
     for (unsigned i = 0; i < sizeof(expandInits)/sizeof(expandInits[0]); ++i)
@@ -163,40 +163,40 @@ void QMakeEvaluator::initFunctionStatics()
         const char * const name;
         const TestFunc func;
     } testInits[] = {
-        {"requires", T_REQUIRES},
-        {"greaterThan", T_GREATERTHAN},
-        {"lessThan", T_LESSTHAN},
-        {"equals", T_EQUALS},
-        {"isEqual", T_EQUALS},
-        {"versionAtLeast", T_VERSION_AT_LEAST},
-        {"versionAtMost", T_VERSION_AT_MOST},
-        {"exists", T_EXISTS},
-        {"export", T_EXPORT},
-        {"clear", T_CLEAR},
-        {"unset", T_UNSET},
-        {"eval", T_EVAL},
-        {"CONFIG", T_CONFIG},
-        {"if", T_IF},
-        {"isActiveConfig", T_CONFIG},
-        {"system", T_SYSTEM},
-        {"discard_from", T_DISCARD_FROM},
-        {"defined", T_DEFINED},
-        {"contains", T_CONTAINS},
-        {"infile", T_INFILE},
-        {"count", T_COUNT},
-        {"isEmpty", T_ISEMPTY},
-        {"parseJson", T_PARSE_JSON},
-        {"load", T_LOAD},
-        {"include", T_INCLUDE},
-        {"debug", T_DEBUG},
-        {"log", T_LOG},
-        {"message", T_MESSAGE},
-        {"warning", T_WARNING},
-        {"error", T_ERROR},
-        {"mkpath", T_MKPATH},
-        {"write_file", T_WRITE_FILE},
-        {"touch", T_TOUCH},
-        {"cache", T_CACHE},
+        { "requires", T_REQUIRES },
+        { "greaterThan", T_GREATERTHAN },
+        { "lessThan", T_LESSTHAN },
+        { "equals", T_EQUALS },
+        { "isEqual", T_EQUALS },
+        { "versionAtLeast", T_VERSION_AT_LEAST },
+        { "versionAtMost", T_VERSION_AT_MOST },
+        { "exists", T_EXISTS },
+        { "export", T_EXPORT },
+        { "clear", T_CLEAR },
+        { "unset", T_UNSET },
+        { "eval", T_EVAL },
+        { "CONFIG", T_CONFIG },
+        { "if", T_IF },
+        { "isActiveConfig", T_CONFIG },
+        { "system", T_SYSTEM },
+        { "discard_from", T_DISCARD_FROM },
+        { "defined", T_DEFINED },
+        { "contains", T_CONTAINS },
+        { "infile", T_INFILE },
+        { "count", T_COUNT },
+        { "isEmpty", T_ISEMPTY },
+        { "parseJson", T_PARSE_JSON },
+        { "load", T_LOAD },
+        { "include", T_INCLUDE },
+        { "debug", T_DEBUG },
+        { "log", T_LOG },
+        { "message", T_MESSAGE },
+        { "warning", T_WARNING },
+        { "error", T_ERROR },
+        { "mkpath", T_MKPATH },
+        { "write_file", T_WRITE_FILE },
+        { "touch", T_TOUCH },
+        { "cache", T_CACHE },
     };
     statics.functions.reserve((int)(sizeof(testInits)/sizeof(testInits[0])));
     for (unsigned i = 0; i < sizeof(testInits)/sizeof(testInits[0]); ++i)
@@ -598,7 +598,7 @@ ProStringList QMakeEvaluator::evaluateBuiltinExpand(
             int width = 0;
             bool zeropad = false;
             bool leftalign = false;
-            enum {DefaultSign, PadSign, AlwaysSign } sign = DefaultSign;
+            enum { DefaultSign, PadSign, AlwaysSign } sign = DefaultSign;
             if (args.count() >= 2) {
                 const auto opts = split_value_list(args.at(1).toQStringRef());
                 for (const ProString &opt : opts) {
@@ -960,10 +960,10 @@ ProStringList QMakeEvaluator::evaluateBuiltinExpand(
                         struct {
                             char in, out;
                         } mapped_quotes[] = {
-                            {'n', '\n' },
-                            {'t', '\t' },
-                            {'r', '\r' },
-                            {0, 0 }
+                            { 'n', '\n' },
+                            { 't', '\t' },
+                            { 'r', '\r' },
+                            { 0, 0 }
                         };
                         for (int i = 0; mapped_quotes[i].in; ++i) {
                             if (*(i_data+x+1) == QLatin1Char(mapped_quotes[i].in)) {
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp
index 9eb14251ba..5e318b170d 100644
--- a/src/shared/proparser/qmakeevaluator.cpp
+++ b/src/shared/proparser/qmakeevaluator.cpp
@@ -161,27 +161,27 @@ void QMakeEvaluator::initStatics()
     static const struct {
         const char * const oldname, * const newname;
     } mapInits[] = {
-        {"INTERFACES", "FORMS"},
-        {"QMAKE_POST_BUILD", "QMAKE_POST_LINK"},
-        {"TARGETDEPS", "POST_TARGETDEPS"},
-        {"LIBPATH", "QMAKE_LIBDIR"},
-        {"QMAKE_EXT_MOC", "QMAKE_EXT_CPP_MOC"},
-        {"QMAKE_MOD_MOC", "QMAKE_H_MOD_MOC"},
-        {"QMAKE_LFLAGS_SHAPP", "QMAKE_LFLAGS_APP"},
-        {"PRECOMPH", "PRECOMPILED_HEADER"},
-        {"PRECOMPCPP", "PRECOMPILED_SOURCE"},
-        {"INCPATH", "INCLUDEPATH"},
-        {"QMAKE_EXTRA_WIN_COMPILERS", "QMAKE_EXTRA_COMPILERS"},
-        {"QMAKE_EXTRA_UNIX_COMPILERS", "QMAKE_EXTRA_COMPILERS"},
-        {"QMAKE_EXTRA_WIN_TARGETS", "QMAKE_EXTRA_TARGETS"},
-        {"QMAKE_EXTRA_UNIX_TARGETS", "QMAKE_EXTRA_TARGETS"},
-        {"QMAKE_EXTRA_UNIX_INCLUDES", "QMAKE_EXTRA_INCLUDES"},
-        {"QMAKE_EXTRA_UNIX_VARIABLES", "QMAKE_EXTRA_VARIABLES"},
-        {"QMAKE_RPATH", "QMAKE_LFLAGS_RPATH"},
-        {"QMAKE_FRAMEWORKDIR", "QMAKE_FRAMEWORKPATH"},
-        {"QMAKE_FRAMEWORKDIR_FLAGS", "QMAKE_FRAMEWORKPATH_FLAGS"},
-        {"IN_PWD", "PWD"},
-        {"DEPLOYMENT", "INSTALLS"}
+        { "INTERFACES", "FORMS" },
+        { "QMAKE_POST_BUILD", "QMAKE_POST_LINK" },
+        { "TARGETDEPS", "POST_TARGETDEPS" },
+        { "LIBPATH", "QMAKE_LIBDIR" },
+        { "QMAKE_EXT_MOC", "QMAKE_EXT_CPP_MOC" },
+        { "QMAKE_MOD_MOC", "QMAKE_H_MOD_MOC" },
+        { "QMAKE_LFLAGS_SHAPP", "QMAKE_LFLAGS_APP" },
+        { "PRECOMPH", "PRECOMPILED_HEADER" },
+        { "PRECOMPCPP", "PRECOMPILED_SOURCE" },
+        { "INCPATH", "INCLUDEPATH" },
+        { "QMAKE_EXTRA_WIN_COMPILERS", "QMAKE_EXTRA_COMPILERS" },
+        { "QMAKE_EXTRA_UNIX_COMPILERS", "QMAKE_EXTRA_COMPILERS" },
+        { "QMAKE_EXTRA_WIN_TARGETS", "QMAKE_EXTRA_TARGETS" },
+        { "QMAKE_EXTRA_UNIX_TARGETS", "QMAKE_EXTRA_TARGETS" },
+        { "QMAKE_EXTRA_UNIX_INCLUDES", "QMAKE_EXTRA_INCLUDES" },
+        { "QMAKE_EXTRA_UNIX_VARIABLES", "QMAKE_EXTRA_VARIABLES" },
+        { "QMAKE_RPATH", "QMAKE_LFLAGS_RPATH" },
+        { "QMAKE_FRAMEWORKDIR", "QMAKE_FRAMEWORKPATH" },
+        { "QMAKE_FRAMEWORKDIR_FLAGS", "QMAKE_FRAMEWORKPATH_FLAGS" },
+        { "IN_PWD", "PWD" },
+        { "DEPLOYMENT", "INSTALLS" }
     };
     statics.varMap.reserve((int)(sizeof(mapInits)/sizeof(mapInits[0])));
     for (unsigned i = 0; i < sizeof(mapInits)/sizeof(mapInits[0]); ++i)