Fix '=' alignment and replace tabs in *.conf (whitespace only change)

Replace all tabs with proper space characters and consistently align
the '=' characters. The default alignment for the '=' of 25 characters
has been left as is to get a minimal diff. Lines with the '=' further
to the right and those belonging to 'proper code (TM)' have not been
touched.

The work was mostly done using the following python script (might
come in handy again...):

import sys, re
indent_eq = 25 + 0*4 # 25 characters was the most widely used indentation for the '=' character
p = re.compile(r'(\w+)[ \t]*([\-\+]?)(=$|= )[ \t]*(.*$)')

for fn in sys.argv[1:]:
    with open(fn, 'r+') as f:
        lines = []
        nl_count = 0
        continuity_indent = None
        for l in f:
            m = p.match(l)
            nl = l
            if m:
                n_spaces = max(m.start(3), indent_eq - 1) - len(m.group(2)) - len(m.group(1))
                if m.group(2) and m.start(2) >= indent_eq-1 and m.start(2) % 4 == 0:
                    n_spaces -= 1 # left-shift '+=' by one if the '+' is aligned to a multiple of 4
                n_spaces = max(1, n_spaces) # we want at least one space before '='/'+='
                nl = m.group(1) + ' '*n_spaces + ''.join(m.group(2,3,4)) + '\n'
                continuity_indent = nl.find('= ') + 2 if l[-2] == '\\' else None # remember indent on '\\$'
            elif continuity_indent:
                nl = ' '*continuity_indent + l.lstrip()
                if l[-2] != '\\': # check when to stop the continuation
                    continuity_indent = None
            elif l.startswith('#'):
                nl = l.expandtabs(2)
            if l != nl:
                nl_count += 1
            lines.append(nl)
        if nl_count > 0:
            print fn, nl_count, len(lines)
            f.seek(0)
            f.writelines(lines)
            f.truncate()

Change-Id: I1d2870d0a2fe2e30d398c140fe523e69dd20c81b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

1 files changed, 62 insertions, 62 deletions

diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index 353aa8833b..4c3bbb5183 100644
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -2,84 +2,84 @@
 # qmake configuration for linux-icc
 #
 
-MAKEFILE_GENERATOR	= UNIX
-CONFIG += gdb_dwarf_index
+MAKEFILE_GENERATOR      = UNIX
+CONFIG                 += gdb_dwarf_index
 
-QMAKE_COMPILER = gcc intel_icc   # icc pretends to be gcc
+QMAKE_COMPILER          = gcc intel_icc   # icc pretends to be gcc
 
-QMAKE_CC		= icc
-QMAKE_LEX		= flex
-QMAKE_LEXFLAGS		=
-QMAKE_YACC		= yacc
-QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		=
-QMAKE_CFLAGS_DEPS	= -M
-QMAKE_CFLAGS_WARN_ON	= -w1 -Wcheck -wd654,1572,411,873,1125,2259,2261
-QMAKE_CFLAGS_WARN_OFF	= -w
-QMAKE_CFLAGS_RELEASE	= -O2 -falign-functions=16 -ansi-alias -fstrict-aliasing
-QMAKE_CFLAGS_DEBUG	= -O0 -g
-QMAKE_CFLAGS_SHLIB	= -fPIC -fno-jump-tables
-QMAKE_CFLAGS_STATIC_LIB	= $$QMAKE_CFLAGS_SHLIB
-QMAKE_CFLAGS_YACC	=
-QMAKE_CFLAGS_THREAD	= -D_REENTRANT
+QMAKE_CC                = icc
+QMAKE_LEX               = flex
+QMAKE_LEXFLAGS          =
+QMAKE_YACC              = yacc
+QMAKE_YACCFLAGS         = -d
+QMAKE_CFLAGS            =
+QMAKE_CFLAGS_DEPS       = -M
+QMAKE_CFLAGS_WARN_ON    = -w1 -Wcheck -wd654,1572,411,873,1125,2259,2261
+QMAKE_CFLAGS_WARN_OFF   = -w
+QMAKE_CFLAGS_RELEASE    = -O2 -falign-functions=16 -ansi-alias -fstrict-aliasing
+QMAKE_CFLAGS_DEBUG      = -O0 -g
+QMAKE_CFLAGS_SHLIB      = -fPIC -fno-jump-tables
+QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
+QMAKE_CFLAGS_YACC       =
+QMAKE_CFLAGS_THREAD     = -D_REENTRANT
 
-QMAKE_CFLAGS_SSE2    += -xSSE2
-QMAKE_CFLAGS_SSE3    += -xSSE3
-QMAKE_CFLAGS_SSSE3   += -xSSSE3
-QMAKE_CFLAGS_SSE4_1  += -xSSE4.1
-QMAKE_CFLAGS_SSE4_2  += -xSSE4.2
-QMAKE_CFLAGS_AVX     += -xAVX
-QMAKE_CFLAGS_AVX2    += -xCORE-AVX2
+QMAKE_CFLAGS_SSE2      += -xSSE2
+QMAKE_CFLAGS_SSE3      += -xSSE3
+QMAKE_CFLAGS_SSSE3     += -xSSSE3
+QMAKE_CFLAGS_SSE4_1    += -xSSE4.1
+QMAKE_CFLAGS_SSE4_2    += -xSSE4.2
+QMAKE_CFLAGS_AVX       += -xAVX
+QMAKE_CFLAGS_AVX2      += -xCORE-AVX2
 
-QMAKE_CXX		= icpc
-QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
-QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXX               = icpc
+QMAKE_CXXFLAGS          = $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS_DEPS     = $$QMAKE_CFLAGS_DEPS
+QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE  = $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG    = $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB    = $$QMAKE_CFLAGS_SHLIB
 QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
-QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+QMAKE_CXXFLAGS_YACC     = $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
 QMAKE_CXXFLAGS_CXX11    = -std=c++0x
 
-QMAKE_INCDIR		=
-QMAKE_LIBDIR		=
-QMAKE_INCDIR_X11	=
-QMAKE_LIBDIR_X11	=
-QMAKE_INCDIR_OPENGL	=
-QMAKE_LIBDIR_OPENGL	=
+QMAKE_INCDIR            =
+QMAKE_LIBDIR            =
+QMAKE_INCDIR_X11        =
+QMAKE_LIBDIR_X11        =
+QMAKE_INCDIR_OPENGL     =
+QMAKE_LIBDIR_OPENGL     =
 
-QMAKE_LINK		= icpc
-QMAKE_LINK_SHLIB	= icpc
-QMAKE_LFLAGS		=
-QMAKE_LFLAGS_RELEASE	=
-QMAKE_LFLAGS_DEBUG	=
-QMAKE_LFLAGS_SHLIB	= -shared -shared-intel
-QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME	= -Wl,-soname,
-QMAKE_LFLAGS_THREAD	=
-QMAKE_LFLAGS_NOUNDEF	= -Wl,-z,defs
-QMAKE_LFLAGS_RPATH	= -Wl,-rpath,
+QMAKE_LINK              = icpc
+QMAKE_LINK_SHLIB        = icpc
+QMAKE_LFLAGS            =
+QMAKE_LFLAGS_RELEASE    =
+QMAKE_LFLAGS_DEBUG      =
+QMAKE_LFLAGS_SHLIB      = -shared -shared-intel
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME     = -Wl,-soname,
+QMAKE_LFLAGS_THREAD     =
+QMAKE_LFLAGS_NOUNDEF    = -Wl,-z,defs
+QMAKE_LFLAGS_RPATH      = -Wl,-rpath,
 QMAKE_LFLAGS_CXX11      =
 
-QMAKE_LIBS		=
-QMAKE_LIBS_DYNLOAD	= -ldl
-QMAKE_LIBS_X11		= -lXext -lX11 -lm
-QMAKE_LIBS_NIS		= -lnsl
-QMAKE_LIBS_OPENGL	= -lGL
-QMAKE_LIBS_THREAD	= -lpthread
+QMAKE_LIBS              =
+QMAKE_LIBS_DYNLOAD      = -ldl
+QMAKE_LIBS_X11          = -lXext -lX11 -lm
+QMAKE_LIBS_NIS          = -lnsl
+QMAKE_LIBS_OPENGL       = -lGL
+QMAKE_LIBS_THREAD       = -lpthread
 
-QMAKE_AR		= xiar cqs
+QMAKE_AR                = xiar cqs
 QMAKE_OBJCOPY           = objcopy
-QMAKE_RANLIB		=
+QMAKE_RANLIB            =
 
-QMAKE_CLEAN		= -r $(OBJECTS_DIR)/ti_files
+QMAKE_CLEAN             = -r $(OBJECTS_DIR)/ti_files
 
 # pch support
 CONFIG += icc_pch_style
-QMAKE_PCH_OUTPUT_EXT    = .pchi
+QMAKE_PCH_OUTPUT_EXT = .pchi
 QMAKE_CXXFLAGS_USE_PRECOMPILE = -pch-use ${QMAKE_PCH_OUTPUT} -include ${QMAKE_PCH_INPUT}
 QMAKE_CXXFLAGS_PRECOMPILE = -c -pch-create ${QMAKE_PCH_OUTPUT} -include ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_TEMP_OBJECT} ${QMAKE_PCH_TEMP_SOURCE}