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

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

Browse Source 
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>
This commit is contained in:
Axel Waggershauser 2013-03-19 02:57:31 +01:00 committed by The Qt Project
parent bbfbf9d24c
commit 5fcf441392
123 changed files with 2783 additions and 2783 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
View File

@ -22,8 +22,8 @@ QMAKE_CFLAGS_SHLIB = # remove -fPIC
QMAKE_CFLAGS_STATIC_LIB = # remove -fPIC
QMAKE_CXX = c++$$VXWORKS_ARCH_MUNCH
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
QMAKE_CXXFLAGS_SHLIB= # remove -fPIC
QMAKE_CXXFLAGS_STATIC_LIB= # remove -fPIC
QMAKE_CXXFLAGS_SHLIB = # remove -fPIC
QMAKE_CXXFLAGS_STATIC_LIB = # remove -fPIC
QMAKE_LINK = $$QMAKE_CXX
QMAKE_LINK_SHLIB = $$QMAKE_CXX
QMAKE_LFLAGS_SHLIB = -Wl,-Ur -L $(WIND_BASE)/target/lib/$$VXWORKS_ARCH/$$VXWORKS_CPU/common # remove -shared

4
mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
View File

@ -22,8 +22,8 @@ QMAKE_CFLAGS_SHLIB = # remove -fPIC
QMAKE_CFLAGS_STATIC_LIB = # remove -fPIC
QMAKE_CXX = c++$$VXWORKS_ARCH_MUNCH
QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
QMAKE_CXXFLAGS_SHLIB= # remove -fPIC
QMAKE_CXXFLAGS_STATIC_LIB= # remove -fPIC
QMAKE_CXXFLAGS_SHLIB = # remove -fPIC
QMAKE_CXXFLAGS_STATIC_LIB = # remove -fPIC
QMAKE_LINK = $$QMAKE_CXX
QMAKE_LINK_SHLIB = $$QMAKE_CXX
QMAKE_LFLAGS_SHLIB = -Wl,-Ur -L $(WIND_BASE)/target/lib/$$VXWORKS_ARCH/$$VXWORKS_CPU/common # remove -shared

2
mkspecs/win32-g++/qmake.conf
View File

@ -76,7 +76,7 @@ QMAKE_LFLAGS_WINDOWS = -Wl,-subsystem,windows
QMAKE_LFLAGS_DLL = -shared
QMAKE_LFLAGS_CXX11 =
QMAKE_LINK_OBJECT_MAX = 10
QMAKE_LINK_OBJECT_SCRIPT= object_script
QMAKE_LINK_OBJECT_SCRIPT = object_script
QMAKE_PREFIX_STATICLIB = lib
QMAKE_EXTENSION_STATICLIB = a